From cb2bc11e7b6aec5487487dfe2487d9c4d97f09f6 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 10 Oct 2017 13:28:18 +0200 Subject: [PATCH] Check out the msan instrumented libraries by default. In order to unblock the chromium roll into WebRTC we have to uniform the WebRTC DEPS file to the change done in: https://chromium-review.googlesource.com/c/chromium/src/+/706280. third_party/instrumented_libraries/scripts/download_binaries.py is not needed anymore and msan instrumented libraries are downloaded by default. Bug: None Change-Id: I46e7442866be38b366a6d53efa2b81bcd276c919 Reviewed-on: https://webrtc-review.googlesource.com/7863 Commit-Queue: Mirko Bonadei Reviewed-by: Henrik Kjellander Cr-Commit-Position: refs/heads/master@{#20220} --- DEPS | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/DEPS b/DEPS index 1e5ab059f7..313b7da3ea 100644 --- a/DEPS +++ b/DEPS @@ -2,6 +2,10 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', + # By default, we should check out everything needed to run on the main + # chromium waterfalls. More info at: crbug.com/570091. + 'checkout_configuration': 'default', + 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'webrtc_git': 'https://webrtc.googlesource.com', 'chromium_revision': 'c6405066cc384ad8a623c2e54fcee6d7ce3aebb9', 'boringssl_git': 'https://boringssl.googlesource.com', @@ -349,13 +353,28 @@ hooks = [ ], }, { - # Pull sanitizer-instrumented third-party libraries if requested via - # GYP_DEFINES. - # See src/third_party/instrumented_libraries/scripts/download_binaries.py. - # TODO(kjellander): Update comment when GYP is completely cleaned up. - 'name': 'instrumented_libraries', - 'pattern': '\\.sha1', - 'action': ['python', 'src/third_party/instrumented_libraries/scripts/download_binaries.py'], + 'name': 'msan_chained_origins', + 'pattern': '.', + 'condition': 'checkout_instrumented_libraries', + 'action': [ 'python', + '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-trusty.tgz.sha1", + ], + }, + { + 'name': 'msan_no_origins', + 'pattern': '.', + 'condition': 'checkout_instrumented_libraries', + 'action': [ 'python', + '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-trusty.tgz.sha1", + ], }, { # Download test resources, i.e. video and audio files from Google Storage.