From 22ae169d17dae392eaf842300e4cd7599ae01377 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 15 Nov 2019 08:59:38 +0100 Subject: [PATCH] Remove dependencies on Chromium's webrtc_overrides. In system_wrappers, two build targets depended on the Chromium's //third_party/webrtc_overides folder. While this was acceptable before, now that the WebRTC component build is landed [1] it can create a path where parts of WebRTC get statically linked in Chromium. To avoid this, this CL removes them and fixes the problem in //third_party/webrtc_overides. [1] - https://chromium-review.googlesource.com/c/chromium/src/+/1874722 Bug: webrtc:9419 Change-Id: I94c739d15eb974371af8087986cee03794f327dc Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159862 Reviewed-by: Karl Wiberg Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#29852} --- system_wrappers/BUILD.gn | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn index f80b08e3f9..f32cafe6d0 100644 --- a/system_wrappers/BUILD.gn +++ b/system_wrappers/BUILD.gn @@ -98,14 +98,6 @@ rtc_library("field_trial") { "../rtc_base:logging", "//third_party/abseil-cpp/absl/strings", ] - if (build_with_chromium) { - # When WebRTC is built as part of Chromium it should exclude the default - # implementation of field_trial unless it is building for NACL or - # Chromecast. - if (!is_nacl && !is_chromecast) { - deps += [ "../../webrtc_overrides:field_trial" ] - } - } } rtc_library("event_wrapper") { @@ -137,9 +129,6 @@ rtc_library("metrics") { "../rtc_base:checks", "../rtc_base:rtc_base_approved", ] - if (build_with_chromium) { - deps += [ "../../webrtc_overrides:metrics" ] - } } if (is_android && !build_with_mozilla) {