Fix instrumentation DEPS for WebRTC
Recent change in the CL below requires this change
https://chromium-review.googlesource.com/c/chromium/src/+/5421930
Bug: b:320564950
Change-Id: I79eded92a210dd5ee3f2182fe5d26d53c299950d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/345920
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Christoffer Dewerin <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42003}
diff --git a/DEPS b/DEPS
index 4ae2f0a..ad3f919 100644
--- a/DEPS
+++ b/DEPS
@@ -17,6 +17,8 @@
# the gn arg 'use_clang_coverage').
'checkout_clang_coverage_tools': False,
+ 'chromium_git': 'https://chromium.googlesource.com',
+
# Keep the Chromium default of generating location tags.
'generate_location_tags': True,
@@ -1703,6 +1705,11 @@
'dep_type': 'cipd',
},
+ 'src/third_party/instrumented_libs': {
+ 'url': Var('chromium_git') + '/chromium/third_party/instrumented_libraries.git' + '@' + '0afcd954d906cd988fa5e55807c19f1443080657',
+ 'condition': 'checkout_instrumented_libraries',
+ },
+
'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': {
'packages': [
{
@@ -2532,30 +2539,6 @@
],
},
{
- 'name': 'msan_chained_origins_focal',
- 'pattern': '.',
- 'condition': 'checkout_instrumented_libraries',
- 'action': [ 'python3',
- 'src/third_party/depot_tools/download_from_google_storage.py',
- '--no_resume',
- '--no_auth',
- '--bucket', 'chromium-instrumented-libraries',
- '-s', 'src/third_party/instrumented_libraries/binaries/msan-chained-origins-focal.tgz.sha1',
- ],
- },
- {
- 'name': 'msan_no_origins_focal',
- 'pattern': '.',
- 'condition': 'checkout_instrumented_libraries',
- 'action': [ 'python3',
- 'src/third_party/depot_tools/download_from_google_storage.py',
- '--no_resume',
- '--no_auth',
- '--bucket', 'chromium-instrumented-libraries',
- '-s', 'src/third_party/instrumented_libraries/binaries/msan-no-origins-focal.tgz.sha1',
- ],
- },
- {
# Download test resources, i.e. video and audio files from Google Storage.
'pattern': '.',
'action': ['download_from_google_storage',
@@ -2602,7 +2585,9 @@
},
]
-recursedeps = []
+recursedeps = [
+ 'src/third_party/instrumented_libs',
+]
# Define rules for which include paths are allowed in our source.
include_rules = [
