From c69fd592707ad9fd982425b67308718dbe20ac2e Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 10 Mar 2020 15:35:38 +0100 Subject: [PATCH] Fix 'all' build on non Android platforms. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Example of failures when trying to build "all": https://ci.chromium.org/p/webrtc/builders/ci/Mac%20Asan/23867 https://ci.chromium.org/p/webrtc/builders/try/linux_tsan2/32911 https://ci.chromium.org/p/webrtc/builders/try/linux_ubsan/32390 All related to missing //third_party/ced code. Bug: webrtc:11411 Change-Id: Ie3d7e87192edfb48d13ab8b14aba05808411a3ea Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170112 Reviewed-by: Patrik Höglund Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#30752} --- BUILD.gn | 2 +- DEPS | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 8feb2b471b..9b643e13e3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -484,7 +484,7 @@ if (!build_with_chromium) { } } - if (rtc_include_tests) { + if (rtc_include_tests && !is_asan) { rtc_executable("webrtc_lib_link_test") { testonly = true diff --git a/DEPS b/DEPS index ce834452a6..bfefd09b88 100644 --- a/DEPS +++ b/DEPS @@ -110,7 +110,6 @@ deps = { 'https://chromium.googlesource.com/catapult.git@8bf3aecd3335cc7b678c2d3ba24eaab6c43de13c', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', - 'condition': 'checkout_android', }, 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',