admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dependencies on Chromium's webrtc_overrides.

Browse Source 
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 <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29852}
This commit is contained in:
Mirko Bonadei 2019-11-15 08:59:38 +01:00 committed by Commit Bot
parent 108a2f025d
commit 22ae169d17
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
system_wrappers/BUILD.gn
View File

@ -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) {