Remove the public_deps to fileutils from test_support.
Bug: webrtc:8946
Change-Id: Ia01d8bb1b42485e29f26792b9266228743d7fd90
No-Presubmit: true
Reviewed-on: https://webrtc-review.googlesource.com/62100
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22465}diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 39a1db3..b086971 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -179,6 +179,7 @@
"../common_audio",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
+ "../test:fileutils",
"../test:test_common",
"../test:test_main",
"//testing/gtest",
@@ -230,6 +231,7 @@
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../test:field_trial",
+ "../test:fileutils",
"../test:single_threaded_task_queue",
"../test:test_common",
"../test:test_main",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 4b6da96..eeb82e8 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -326,6 +326,7 @@
"../system_wrappers:runtime_enabled_features_default",
"../test:direct_transport",
"../test:field_trial",
+ "../test:fileutils",
"../test:perf_test",
"../test:test_common",
"../test:test_support",
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 736125b..13b1e55 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -456,6 +456,7 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:cpu_features_api",
+ "../test:fileutils",
"../test:test_main",
"//testing/gtest",
]
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 7b91b00..bd4c5f7 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -115,6 +115,7 @@
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../system_wrappers:system_wrappers",
+ "../test:fileutils",
"../test:test_main",
"../test:video_test_common",
"//testing/gtest",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index d5d7e55..7b83c37 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -316,6 +316,7 @@
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
+ "../test:fileutils",
"../test:test_support",
"//testing/gtest",
]
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 760c89a..c20bd2b 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1378,6 +1378,7 @@
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
+ "../../test:fileutils",
"../../test:test_support",
]
defines = audio_coding_defines
@@ -1411,6 +1412,7 @@
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
+ "../../test:fileutils",
"../../test:perf_test",
"../../test:test_support",
]
@@ -1485,6 +1487,7 @@
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:system_wrappers_default",
+ "../../test:fileutils",
"../../test:test_support",
"../rtp_rtcp",
"//testing/gtest",
@@ -1516,6 +1519,7 @@
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:system_wrappers_default",
+ "../../test:fileutils",
"../../test:test_support",
"../rtp_rtcp",
"//testing/gtest",
@@ -1546,7 +1550,9 @@
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
- deps = []
+ deps = [
+ "../../test:fileutils",
+ ]
defines = neteq_defines
@@ -1591,6 +1597,7 @@
"..:module_api",
"../..:typedefs",
"../../rtc_base:checks",
+ "../../test:fileutils",
]
sources = [
"neteq/tools/neteq_rtpplay.cc",
@@ -1640,6 +1647,7 @@
defines = []
deps = [
"../..:typedefs",
+ "../../test:fileutils",
]
sources = [
"codecs/isac/fix/test/isac_speed_test.cc",
@@ -1705,6 +1713,7 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
+ "../../test:fileutils",
"../../test:test_support",
"//testing/gtest",
]
@@ -1731,6 +1740,7 @@
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
+ "../../test:fileutils",
"../../test:test_support",
"//testing/gtest",
]
@@ -1848,6 +1858,7 @@
"../..:webrtc_common",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
+ "../../test:fileutils",
"../../test:test_support",
]
}
@@ -1868,6 +1879,7 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
+ "../../test:fileutils",
"../../test:test_main",
"//testing/gtest",
]
@@ -1903,6 +1915,7 @@
":neteq_quality_test_support",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
+ "../../test:fileutils",
"../../test:test_main",
"//testing/gtest",
]
@@ -1921,6 +1934,7 @@
":pcm16b",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
+ "../../test:fileutils",
"../../test:test_main",
"//testing/gtest",
]
@@ -2082,6 +2096,7 @@
":webrtc_opus",
"../../common_audio",
"../../rtc_base:rtc_base_approved",
+ "../../test:fileutils",
"../../test:test_main",
"//testing/gtest",
]
@@ -2220,6 +2235,7 @@
"../../system_wrappers:cpu_features_api",
"../../test:audio_codec_mocks",
"../../test:field_trial",
+ "../../test:fileutils",
"../../test:rtp_test_utils",
"../../test:test_common",
"../../test:test_support",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 84d70ec..81b7454 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -400,6 +400,7 @@
"../../rtc_base:rtc_base_approved",
"../../sdk:audio_objc",
"../../system_wrappers",
+ "../../test:fileutils",
"../../test:test_support",
"//third_party/ocmock",
]
@@ -428,6 +429,7 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
+ "../../test:fileutils",
"../../test:test_support",
"../utility:utility",
]
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 6e6ce30..09b0bd4 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -541,6 +541,7 @@
"../../rtc_base:safe_minmax",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
+ "../../test:fileutils",
"../../test:test_support",
"../audio_coding:neteq_input_audio_tools",
"aec_dump:mock_aec_dump_unittests",
@@ -650,6 +651,7 @@
":audio_processing",
":file_audio_generator",
"../../rtc_base:rtc_base_approved",
+ "../../test:fileutils",
"../../test:test_support",
]
}
@@ -743,6 +745,7 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
+ "../../test:fileutils",
"../../test:test_support",
"../audio_coding:neteq_input_audio_tools",
"//testing/gtest",
@@ -765,6 +768,7 @@
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:metrics_default",
+ "../../test:fileutils",
"../../test:test_support",
"//testing/gtest",
]
diff --git a/modules/audio_processing/aec_dump/BUILD.gn b/modules/audio_processing/aec_dump/BUILD.gn
index b6a9dd3..7afaaf4 100644
--- a/modules/audio_processing/aec_dump/BUILD.gn
+++ b/modules/audio_processing/aec_dump/BUILD.gn
@@ -84,6 +84,7 @@
"..:audioproc_debug_proto",
"../../../modules:module_api",
"../../../rtc_base:rtc_task_queue",
+ "../../../test:fileutils",
"../../../test:test_support",
"//testing/gtest",
]
diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn
index 8f13d27..b1cb079 100644
--- a/modules/audio_processing/test/conversational_speech/BUILD.gn
+++ b/modules/audio_processing/test/conversational_speech/BUILD.gn
@@ -23,6 +23,7 @@
deps = [
":lib",
"../../../../rtc_base:rtc_base_approved",
+ "../../../../test:fileutils",
"../../../../test:test_support",
]
}
@@ -71,6 +72,7 @@
"../../../../api:optional",
"../../../../common_audio",
"../../../../rtc_base:rtc_base_approved",
+ "../../../../test:fileutils",
"../../../../test:test_support",
"//testing/gtest",
]
diff --git a/modules/audio_processing/vad/BUILD.gn b/modules/audio_processing/vad/BUILD.gn
index b7363e3..9976b78 100644
--- a/modules/audio_processing/vad/BUILD.gn
+++ b/modules/audio_processing/vad/BUILD.gn
@@ -62,6 +62,7 @@
":vad",
"../..:module_api",
"../../../common_audio",
+ "../../../test:fileutils",
"../../../test:test_support",
"//testing/gmock",
"//testing/gtest",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index c4c7515..902afa5 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -147,6 +147,7 @@
"../../rtc_base/system:fallthrough",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
+ "../../test:fileutils",
"../../test:perf_test",
"../../test:test_support",
"../bitrate_controller",
@@ -173,6 +174,7 @@
":remote_bitrate_estimator",
"../../rtc_base:rtc_base_approved",
"../../test:field_trial",
+ "../../test:fileutils",
"../../test:test_support",
]
if (!build_with_chromium && is_clang) {
@@ -210,6 +212,7 @@
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../test:field_trial",
+ "../../test:fileutils",
"../../test:test_support",
"../pacing:pacing",
"../rtp_rtcp:rtp_rtcp_format",
@@ -237,6 +240,7 @@
":remote_bitrate_estimator",
"../..:webrtc_common",
"../../rtc_base:rtc_base_approved",
+ "../../test:fileutils",
"../../test:test_main",
"//testing/gtest",
]
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 8e1c232..4d8ca72 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -302,6 +302,7 @@
deps = [
":rtp_rtcp",
+ "../../test:fileutils",
"../../test:test_main",
"//testing/gtest",
]
@@ -317,6 +318,7 @@
":rtp_rtcp",
":rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
+ "../../test:fileutils",
"../../test:test_support",
]
}
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 8e92cbe..0a90141 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -590,6 +590,7 @@
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
"../../system_wrappers",
+ "../../test:fileutils",
"../../test:test_common",
"../../test:test_support",
"../../test:video_test_common",
@@ -660,6 +661,7 @@
"../../rtc_base:rtc_base_tests_utils",
"../../system_wrappers",
"../../test:field_trial",
+ "../../test:fileutils",
"../../test:test_support",
"../../test:video_test_common",
"../../test:video_test_support",
@@ -769,6 +771,7 @@
"../../system_wrappers:metrics_api",
"../../system_wrappers:metrics_default",
"../../test:field_trial",
+ "../../test:fileutils",
"../../test:test_support",
"../../test:video_test_common",
"../../test:video_test_support",
diff --git a/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn
index 351e579..d0f995c 100644
--- a/modules/video_processing/BUILD.gn
+++ b/modules/video_processing/BUILD.gn
@@ -112,6 +112,7 @@
deps = [
":video_processing",
"../../common_video:common_video",
+ "../../test:fileutils",
"../../test:test_support",
"../../test:video_test_common",
]
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 54bf0c7..592f574 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -479,6 +479,7 @@
"../api:mock_rtp",
"../rtc_base:checks",
"../rtc_base:stringutils",
+ "../test:fileutils",
]
if (is_android) {
deps += [ ":android_black_magic" ]
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index b4f2c17..50e0b24 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -926,6 +926,7 @@
":rtc_base_tests_utils",
"../system_wrappers:field_trial_default",
"../test:field_trial",
+ "../test:fileutils",
"../test:test_support",
]
@@ -952,6 +953,7 @@
":rtc_base_tests_main",
":rtc_base_tests_utils",
"../system_wrappers:system_wrappers",
+ "../test:fileutils",
"../test:test_support",
"//testing/gtest",
]
@@ -1020,6 +1022,7 @@
":stringutils",
"../api:array_view",
"../system_wrappers:system_wrappers",
+ "../test:fileutils",
"../test:test_support",
]
}
@@ -1146,6 +1149,7 @@
":stringutils",
"../api:array_view",
"../api:optional",
+ "../test:fileutils",
"../test:test_support",
]
public_deps = [
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 13abc70..f57ef40 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -272,6 +272,7 @@
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
"../test:field_trial",
+ "../test:fileutils",
"../test:test_support",
]
}
@@ -344,6 +345,7 @@
"../common_video:common_video",
"../rtc_base",
"../rtc_base:checks",
+ "../test:fileutils",
"../test:test_main",
"//testing/gtest",
]
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 4d2d209..67c9357 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -81,6 +81,7 @@
deps = [
":network_tester",
"../../rtc_base:rtc_base_tests_utils",
+ "../../test:fileutils",
"../../test:test_support",
"//testing/gtest",
]
diff --git a/test/BUILD.gn b/test/BUILD.gn
index d47e6bc..b459853 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -175,9 +175,7 @@
"testsupport/unittest_utils.h",
]
- public_deps = [
- ":fileutils",
- ]
+ public_deps = []
if (is_ios) {
public_deps += [ ":test_support_objc" ]
}
@@ -221,6 +219,7 @@
]
deps = [
":field_trial",
+ ":fileutils",
":perf_test",
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
@@ -243,6 +242,7 @@
]
deps = [
+ ":fileutils",
":test_support",
":video_test_common",
"..:webrtc_common",
@@ -264,10 +264,6 @@
sources += [ "testsupport/jpeg_frame_writer_ios.cc" ]
}
- public_deps = [
- ":fileutils",
- ]
-
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
@@ -320,6 +316,7 @@
rtc_test("test_support_unittests") {
deps = [
+ ":fileutils",
":perf_test",
":rtp_test_utils",
"../api:video_frame_api",
@@ -395,12 +392,7 @@
rtc_source_set("fileutils") {
testonly = true
- visibility = [
- ":fileutils_unittests",
- ":test_support_test_artifacts",
- ":test_support",
- ":video_test_support",
- ]
+ visibility = [ "*" ]
sources = [
"testsupport/fileutils.cc",
"testsupport/fileutils.h",
@@ -561,6 +553,7 @@
deps = [
":direct_transport",
+ ":fileutils",
":rtp_test_utils",
":test_support",
":video_test_common",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index fc2a750..35d9ffe 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -124,6 +124,7 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers",
+ "../test:fileutils",
"../test:perf_test",
"../test:rtp_test_utils",
"../test:test_common",
@@ -357,6 +358,7 @@
"../system_wrappers:metrics_default",
"../test:direct_transport",
"../test:field_trial",
+ "../test:fileutils",
"../test:perf_test",
"../test:rtp_test_utils",
"../test:test_common",