| commit | c69fd592707ad9fd982425b67308718dbe20ac2e | [log] [tgz] |
|---|---|---|
| author | Mirko Bonadei <mbonadei@webrtc.org> | Tue Mar 10 14:35:38 2020 |
| committer | Commit Bot <commit-bot@chromium.org> | Wed Mar 11 08:24:27 2020 |
| tree | 6661a2266f6e93e7c92af9c58100f3b41cc33778 | |
| parent | 59f3b71c04deb301c989d8f316424d01dd91d2c5 [diff] |
Fix 'all' build on non Android platforms. 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 <phoglund@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30752}
diff --git a/BUILD.gn b/BUILD.gn index 8feb2b4..9b643e1 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -484,7 +484,7 @@ } } - 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 ce83445..bfefd09 100644 --- a/DEPS +++ b/DEPS
@@ -110,7 +110,6 @@ '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',