Removing conditional visibility.
Conditional visibility is complex to maintain and it is not well
supported by other build systems.
This CL removes it and falls back on the more relaxed visibility value
("*" in this case).
It is not a problem because the targets that are using conditional
visibility are all marked as "testonly" and this is probably enough to
keep the build graph clean.
Bug: None
Change-Id: I2d2b5ac9a02d08c2863950116db455976ee1459c
No-Try: True
Reviewed-on: https://webrtc-review.googlesource.com/14902
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20658}diff --git a/api/BUILD.gn b/api/BUILD.gn
index 05b8902..69e09db 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -356,12 +356,6 @@
rtc_source_set("rtc_api_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:rtc_unittests" ]
- }
sources = [
"array_view_unittest.cc",
"optional_unittest.cc",
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 80545ca..472211e 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -86,13 +86,6 @@
rtc_source_set("audio_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:video_engine_tests" ]
- }
-
# TODO(kjellander): Remove (bugs.webrtc.org/6828)
# This needs remote_bitrate_estimator to be moved to webrtc/api first.
check_includes = false
@@ -191,12 +184,6 @@
rtc_source_set("audio_perf_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:webrtc_perf_tests" ]
- }
sources = [
"test/audio_bwe_integration_test.cc",
"test/audio_bwe_integration_test.h",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 6a4f065..faa611d 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -176,12 +176,6 @@
rtc_source_set("call_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:video_engine_tests" ]
- }
sources = [
"bitrate_allocator_unittest.cc",
"bitrate_estimator_tests.cc",
@@ -234,12 +228,6 @@
rtc_source_set("call_perf_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:webrtc_perf_tests" ]
- }
sources = [
"call_perf_tests.cc",
"rampup_tests.cc",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index e5854ef..0fed244 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1224,12 +1224,6 @@
rtc_source_set("audio_coding_modules_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_tests" ]
- }
sources = [
"test/ACMTest.h",
"test/APITest.cc",
@@ -1292,12 +1286,6 @@
rtc_source_set("audio_coding_perf_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "../..:webrtc_perf_tests" ]
- }
sources = [
"codecs/opus/opus_complexity_unittest.cc",
"neteq/test/neteq_performance_unittest.cc",
@@ -2047,12 +2035,6 @@
rtc_source_set("audio_coding_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"acm2/acm_receiver_unittest.cc",
"acm2/audio_coding_module_unittest.cc",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 8f6f746..ba39ac0 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -320,12 +320,6 @@
rtc_source_set("audio_device_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"fine_audio_buffer_unittest.cc",
]
diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
index 5b03a9a..00e3e60 100644
--- a/modules/audio_mixer/BUILD.gn
+++ b/modules/audio_mixer/BUILD.gn
@@ -70,12 +70,6 @@
rtc_source_set("audio_mixer_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"audio_frame_manipulator_unittest.cc",
"audio_mixer_impl_unittest.cc",
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index c222d1d..b36c117 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -505,12 +505,6 @@
rtc_source_set("audio_processing_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"aec/echo_cancellation_unittest.cc",
"aec/system_delay_unittest.cc",
@@ -687,12 +681,6 @@
check_includes = false
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "../..:webrtc_perf_tests" ]
- }
sources = [
"audio_processing_performance_unittest.cc",
"level_controller/level_controller_complexity_unittest.cc",
diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
index 2f8dd15..1439f54 100644
--- a/modules/bitrate_controller/BUILD.gn
+++ b/modules/bitrate_controller/BUILD.gn
@@ -47,12 +47,6 @@
rtc_source_set("bitrate_controller_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"bitrate_controller_unittest.cc",
"send_side_bandwidth_estimation_unittest.cc",
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index be0afd2..c53f073 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -67,12 +67,6 @@
rtc_source_set("congestion_controller_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"acknowledged_bitrate_estimator_unittest.cc",
"congestion_controller_unittests_helper.cc",
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 43324d1..982e2aa 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -36,12 +36,6 @@
rtc_source_set("desktop_capture_modules_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_tests" ]
- }
sources = []
deps = []
if (rtc_desktop_capture_supported) {
@@ -66,12 +60,6 @@
rtc_source_set("desktop_capture_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"blank_detector_desktop_capturer_wrapper_unittest.cc",
"cropped_desktop_frame_unittest.cc",
diff --git a/modules/media_file/BUILD.gn b/modules/media_file/BUILD.gn
index 62cd1ad..77b2637 100644
--- a/modules/media_file/BUILD.gn
+++ b/modules/media_file/BUILD.gn
@@ -45,12 +45,6 @@
rtc_source_set("media_file_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"media_file_unittest.cc",
]
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index e9d8348..2364432 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -49,12 +49,6 @@
rtc_source_set("pacing_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"alr_detector_unittest.cc",
"bitrate_prober_unittest.cc",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index adfb2e2..73ad176 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -158,12 +158,6 @@
rtc_source_set("remote_bitrate_estimator_perf_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "../..:webrtc_perf_tests" ]
- }
sources = [
"remote_bitrate_estimators_test.cc",
]
@@ -183,12 +177,6 @@
rtc_source_set("remote_bitrate_estimator_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"aimd_rate_control_unittest.cc",
"inter_arrival_unittest.cc",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 0aa6678..9f9de96 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -294,12 +294,6 @@
rtc_source_set("rtp_rtcp_modules_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "../../modules:modules_tests" ]
- }
sources = [
"test/testFec/test_fec.cc",
]
@@ -317,12 +311,6 @@
rtc_source_set("rtp_rtcp_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"source/byte_io_unittest.cc",
"source/flexfec_header_reader_writer_unittest.cc",
diff --git a/modules/utility/BUILD.gn b/modules/utility/BUILD.gn
index 7d03707..cba8b17 100644
--- a/modules/utility/BUILD.gn
+++ b/modules/utility/BUILD.gn
@@ -57,12 +57,6 @@
rtc_source_set("utility_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"source/process_thread_impl_unittest.cc",
]
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 728ed80..01ecaa8 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -447,12 +447,6 @@
rtc_source_set("video_coding_modules_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_tests" ]
- }
sources = [
"codecs/h264/test/h264_impl_unittest.cc",
"codecs/stereo/test/stereo_adapter_unittest.cc",
@@ -531,12 +525,6 @@
rtc_source_set("video_coding_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"codecs/test/packet_manipulator_unittest.cc",
"codecs/test/stats_unittest.cc",
diff --git a/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn
index efe5458..fb4888b 100644
--- a/modules/video_processing/BUILD.gn
+++ b/modules/video_processing/BUILD.gn
@@ -103,12 +103,6 @@
rtc_source_set("video_processing_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:modules_unittests" ]
- }
sources = [
"test/denoiser_test.cc",
]
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index f973137..ab1fd8a 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -147,12 +147,6 @@
rtc_source_set("rtc_p2p_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:rtc_unittests" ]
- }
sources = [
"base/asyncstuntcpsocket_unittest.cc",
"base/dtlstransport_unittest.cc",
@@ -212,12 +206,6 @@
rtc_source_set("libstunprober_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:rtc_unittests" ]
- }
sources = [
"stunprober/stunprober_unittest.cc",
]
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index bc9b929..971d32d 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -827,13 +827,6 @@
rtc_source_set("rtc_base_nonparallel_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- # TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "..:webrtc_nonparallel_tests" ]
- }
sources = [
"cpu_time_unittest.cc",
"filerotatingstream_unittest.cc",
@@ -859,13 +852,6 @@
rtc_source_set("rtc_base_approved_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- # TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "..:rtc_unittests" ]
- }
sources = [
"atomicops_unittest.cc",
"base64_unittest.cc",
@@ -923,13 +909,6 @@
rtc_source_set("rtc_task_queue_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- # TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "..:rtc_unittests" ]
- }
sources = [
"task_queue_unittest.cc",
]
@@ -945,13 +924,6 @@
rtc_source_set("sequenced_task_checker_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- # TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "..:rtc_unittests" ]
- }
sources = [
"sequenced_task_checker_unittest.cc",
]
@@ -967,13 +939,6 @@
rtc_source_set("weak_ptr_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- # TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "..:rtc_unittests" ]
- }
sources = [
"weak_ptr_unittest.cc",
]
@@ -989,13 +954,6 @@
rtc_source_set("rtc_numerics_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- # TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "..:rtc_unittests" ]
- }
sources = [
"numerics/exp_filter_unittest.cc",
"numerics/moving_median_filter_unittest.cc",
@@ -1018,13 +976,6 @@
rtc_source_set("rtc_base_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- # TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "..:rtc_unittests" ]
- }
sources = [
"callback_unittest.cc",
"crc32_unittest.cc",
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index bb6f86c..cfc116c 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -73,12 +73,6 @@
rtc_source_set("network_tester_unittests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:tools_unittests" ]
- }
sources = [
"network_tester_unittest.cc",
]
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 787ca8c..0c0eff2 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -577,12 +577,6 @@
rtc_source_set("sdk_unittests_objc") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:rtc_unittests" ]
- }
sources = [
"objc/Framework/UnitTests/RTCConfigurationTest.mm",
"objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index e75a446..434857b 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -135,12 +135,6 @@
rtc_source_set("video_full_stack_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:webrtc_perf_tests" ]
- }
sources = [
"full_stack_tests.cc",
]
@@ -244,12 +238,6 @@
rtc_source_set("video_tests") {
testonly = true
- # Skip restricting visibility on mobile platforms since the tests on those
- # gets additional generated targets which would require many lines here to
- # cover (which would be confusing to read and hard to maintain).
- if (!is_android && !is_ios) {
- visibility = [ "..:video_engine_tests" ]
- }
defines = []
sources = [
"call_stats_unittest.cc",