From 2419dc9cfcf2bd080fd10eabd517a773502e7d5b Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 18 Nov 2019 07:36:18 +0000 Subject: [PATCH] Revert "Force Chromium deps on the WebRTC component." This reverts commit 53e157d25ce78ba6cd8625b0b655b46f8e1b0a91. Reason for revert: Breaks Chromium iOS FYI bots. https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20ios-device/5088 Original change's description: > Force Chromium deps on the WebRTC component. > > This CL adds a visibility check to the rtc_* GN templates in order > to force Chromium to depend only on publicly visible targets from > //third_party/webrtc_overrides and not from //third_party/webrtc. > > This is required in order to ensure that the Chromium's component > builds continues to work correctly without introducing direct > dependency paths on WebRTC that would statically link it in multiple > shared libraries. > > Bug: webrtc:9419 > Change-Id: Ib89f4fc571512f99678ee4f61696b316374346d9 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154344 > Commit-Queue: Mirko Bonadei > Reviewed-by: Dirk Pranke > Reviewed-by: Karl Wiberg > Cr-Commit-Position: refs/heads/master@{#29806} TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,dpranke@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. TBR: kwiberg@webrtc.org Bug: webrtc:9419 Change-Id: Id4d906910d569a3e5db3afef8c03672fba6dad81 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159921 Commit-Queue: Mirko Bonadei Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#29813} --- api/task_queue/BUILD.gn | 9 --------- webrtc.gni | 30 ------------------------------ 2 files changed, 39 deletions(-) diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn index 00be7842df..7d449778bb 100644 --- a/api/task_queue/BUILD.gn +++ b/api/task_queue/BUILD.gn @@ -39,15 +39,6 @@ rtc_library("task_queue_test") { check_includes = false # no-presubmit-check TODO(bugs.webrtc.org/9419) if (build_with_chromium) { - visibility = [] - visibility = webrtc_default_visibility - visibility += [ - # This is the only Chromium target that can depend on this. The reason - # behind this is the fact that this is a 'testonly' target and as such - # it cannot be part of the WebRTC component. - "//third_party/blink/renderer/platform:blink_platform_unittests_sources", - ] - # Don't depend on WebRTC code outside of webrtc_overrides:webrtc_component # because this will break the WebRTC component build in Chromium. deps = [ diff --git a/webrtc.gni b/webrtc.gni index ec0ca54940..4e0f3641f2 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -471,21 +471,6 @@ template("rtc_source_set") { } } - # Chromium should only depend on the WebRTC component in order to - # avoid to statically link WebRTC in a component build. - if (build_with_chromium) { - publicly_visible = false - foreach(v, visibility) { - if (v == "*") { - publicly_visible = true - } - } - if (publicly_visible) { - visibility = [] - visibility = webrtc_default_visibility - } - } - if (!defined(testonly) || !testonly) { configs += rtc_prod_configs } @@ -658,21 +643,6 @@ template("rtc_library") { } } - # Chromium should only depend on the WebRTC component in order to - # avoid to statically link WebRTC in a component build. - if (build_with_chromium) { - publicly_visible = false - foreach(v, visibility) { - if (v == "*") { - publicly_visible = true - } - } - if (publicly_visible) { - visibility = [] - visibility = webrtc_default_visibility - } - } - if (!defined(testonly) || !testonly) { configs += rtc_prod_configs }