Remove public_deps usage in neteq build targets.
Bug: b/36882554
Change-Id: I9a020e534a9f2c93de09684865a5bdddc60bd55d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266762
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@google.com>
Cr-Commit-Position: refs/heads/main@{#37323}
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 30d6c8c..ba6c2fd 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1119,6 +1119,8 @@
]
deps = [
+ ":neteq_tools",
+ ":neteq_tools_minimal",
":pcm16b",
"../../api:array_view",
"../../api:rtp_headers",
@@ -1133,11 +1135,6 @@
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
- public_deps = [
- ":neteq_tools",
- ":neteq_tools_minimal",
- ]
-
if (rtc_enable_protobuf) {
sources += [
"neteq/tools/neteq_event_log_input.cc",
@@ -1163,6 +1160,8 @@
]
deps = [
+ ":neteq_input_audio_tools",
+ ":neteq_tools_minimal",
"..:module_api_public",
"../../api:array_view",
"../../api/audio_codecs:audio_codecs_api",
@@ -1177,11 +1176,6 @@
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
-
- public_deps = [
- ":neteq_input_audio_tools",
- ":neteq_tools_minimal",
- ]
}
rtc_library("neteq_input_audio_tools") {
@@ -1460,6 +1454,7 @@
deps = [
":audio_coding",
":neteq_tools",
+ ":neteq_tools_minimal",
"../../api:scoped_refptr",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
@@ -1482,7 +1477,9 @@
deps = [
":audio_coding",
+ ":neteq_input_audio_tools",
":neteq_tools",
+ ":neteq_tools_minimal",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
@@ -1519,15 +1516,16 @@
":isac",
":isac_fix",
":neteq",
+ ":neteq_input_audio_tools",
":neteq_tools",
- "../../test:fileutils",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs/opus:audio_encoder_opus",
"../../common_audio",
"../../rtc_base/system:arch",
+ "../../test:fileutils",
"../../test:test_main",
- "//testing/gtest",
"../../test:test_support",
+ "//testing/gtest",
] + audio_coding_deps
data = audio_decoder_unittests_resources
@@ -1553,6 +1551,9 @@
visibility += webrtc_default_visibility
defines = audio_codec_defines
deps = [
+ ":neteq_input_audio_tools",
+ ":neteq_tools",
+ ":neteq_tools_minimal",
"../../rtc_base:checks",
"../../rtc_base:refcount",
"../../test:fileutils",
@@ -1583,6 +1584,7 @@
deps = [
":neteq_test_factory",
":neteq_test_tools",
+ ":neteq_tools_minimal",
"../../rtc_base:stringutils",
"../../system_wrappers:field_trial",
"../../test:field_trial",
@@ -1687,7 +1689,9 @@
deps = [
":default_neteq_factory",
":neteq",
+ ":neteq_input_audio_tools",
":neteq_test_tools",
+ ":neteq_tools_minimal",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/neteq:neteq_api",
"../../rtc_base:checks",
@@ -1762,6 +1766,7 @@
deps = [
":neteq",
":neteq_test_tools",
+ ":neteq_tools_minimal",
":pcm16b",
"//testing/gtest",
"//third_party/abseil-cpp/absl/flags:flag",
@@ -2064,8 +2069,11 @@
":legacy_encoded_audio_frame",
":mocks",
":neteq",
+ ":neteq_input_audio_tools",
":neteq_test_support",
":neteq_test_tools",
+ ":neteq_tools",
+ ":neteq_tools_minimal",
":pcm16b",
":red",
":webrtc_cng",
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 6a4c61b..1a56be8 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -380,6 +380,8 @@
":chart_proto",
"../api:function_view",
"../api:network_state_predictor_api",
+ "../modules/audio_coding:neteq_input_audio_tools",
+ "../modules/audio_coding:neteq_tools_minimal",
"../rtc_base:ignore_wundef",
"../rtc_base:logging",
"../rtc_base:macromagic",