zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove public_deps usage in neteq build targets.

Browse Source 
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}
This commit is contained in:
Mirko Bonadei
2022-06-24 14:23:17 +02:00
committed by WebRTC LUCI CQ
parent 2fdf222da3
commit 22ca4fb44a
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/audio_coding/BUILD.gn
View File

@ -1119,6 +1119,8 @@ rtc_library("neteq_test_tools") {
] ]
deps = [ deps = [
":neteq_tools",
":neteq_tools_minimal",
":pcm16b", ":pcm16b",
"../../api:array_view", "../../api:array_view",
"../../api:rtp_headers", "../../api:rtp_headers",
@ -1133,11 +1135,6 @@ rtc_library("neteq_test_tools") {
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
public_deps = [
":neteq_tools",
":neteq_tools_minimal",
]
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
sources += [ sources += [
"neteq/tools/neteq_event_log_input.cc", "neteq/tools/neteq_event_log_input.cc",
@ -1163,6 +1160,8 @@ rtc_library("neteq_tools") {
] ]
deps = [ deps = [
":neteq_input_audio_tools",
":neteq_tools_minimal",
"..:module_api_public", "..:module_api_public",
"../../api:array_view", "../../api:array_view",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
@ -1177,11 +1176,6 @@ rtc_library("neteq_tools") {
"//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
public_deps = [
":neteq_input_audio_tools",
":neteq_tools_minimal",
]
} }
rtc_library("neteq_input_audio_tools") { rtc_library("neteq_input_audio_tools") {
@ -1460,6 +1454,7 @@ if (rtc_include_tests) {
deps = [ deps = [
":audio_coding", ":audio_coding",
":neteq_tools", ":neteq_tools",
":neteq_tools_minimal",
"../../api:scoped_refptr", "../../api:scoped_refptr",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory", "../../api/audio_codecs:builtin_audio_decoder_factory",
@ -1482,7 +1477,9 @@ if (rtc_include_tests) {
deps = [ deps = [
":audio_coding", ":audio_coding",
":neteq_input_audio_tools",
":neteq_tools", ":neteq_tools",
":neteq_tools_minimal",
"../../api/audio:audio_frame_api", "../../api/audio:audio_frame_api",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory", "../../api/audio_codecs:builtin_audio_decoder_factory",
@ -1519,15 +1516,16 @@ if (rtc_include_tests) {
":isac", ":isac",
":isac_fix", ":isac_fix",
":neteq", ":neteq",
":neteq_input_audio_tools",
":neteq_tools", ":neteq_tools",
"../../test:fileutils",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs/opus:audio_encoder_opus", "../../api/audio_codecs/opus:audio_encoder_opus",
"../../common_audio", "../../common_audio",
"../../rtc_base/system:arch", "../../rtc_base/system:arch",
"../../test:fileutils",
"../../test:test_main", "../../test:test_main",
"//testing/gtest",
"../../test:test_support", "../../test:test_support",
"//testing/gtest",
] + audio_coding_deps ] + audio_coding_deps
data = audio_decoder_unittests_resources data = audio_decoder_unittests_resources
@ -1553,6 +1551,9 @@ if (rtc_include_tests) {
visibility += webrtc_default_visibility visibility += webrtc_default_visibility
defines = audio_codec_defines defines = audio_codec_defines
deps = [ deps = [
":neteq_input_audio_tools",
":neteq_tools",
":neteq_tools_minimal",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:refcount", "../../rtc_base:refcount",
"../../test:fileutils", "../../test:fileutils",
@ -1583,6 +1584,7 @@ if (rtc_include_tests) {
deps = [ deps = [
":neteq_test_factory", ":neteq_test_factory",
":neteq_test_tools", ":neteq_test_tools",
":neteq_tools_minimal",
"../../rtc_base:stringutils", "../../rtc_base:stringutils",
"../../system_wrappers:field_trial", "../../system_wrappers:field_trial",
"../../test:field_trial", "../../test:field_trial",
@ -1687,7 +1689,9 @@ if (rtc_include_tests) {
deps = [ deps = [
":default_neteq_factory", ":default_neteq_factory",
":neteq", ":neteq",
":neteq_input_audio_tools",
":neteq_test_tools", ":neteq_test_tools",
":neteq_tools_minimal",
"../../api/audio_codecs:builtin_audio_decoder_factory", "../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/neteq:neteq_api", "../../api/neteq:neteq_api",
"../../rtc_base:checks", "../../rtc_base:checks",
@ -1762,6 +1766,7 @@ if (rtc_include_tests) {
deps = [ deps = [
":neteq", ":neteq",
":neteq_test_tools", ":neteq_test_tools",
":neteq_tools_minimal",
":pcm16b", ":pcm16b",
"//testing/gtest", "//testing/gtest",
"//third_party/abseil-cpp/absl/flags:flag", "//third_party/abseil-cpp/absl/flags:flag",
@ -2064,8 +2069,11 @@ if (rtc_include_tests) {
":legacy_encoded_audio_frame", ":legacy_encoded_audio_frame",
":mocks", ":mocks",
":neteq", ":neteq",
":neteq_input_audio_tools",
":neteq_test_support", ":neteq_test_support",
":neteq_test_tools", ":neteq_test_tools",
":neteq_tools",
":neteq_tools_minimal",
":pcm16b", ":pcm16b",
":red", ":red",
":webrtc_cng", ":webrtc_cng",

2
rtc_tools/BUILD.gn
View File

@ -380,6 +380,8 @@ if (!build_with_chromium) {
":chart_proto", ":chart_proto",
"../api:function_view", "../api:function_view",
"../api:network_state_predictor_api", "../api:network_state_predictor_api",
"../modules/audio_coding:neteq_input_audio_tools",
"../modules/audio_coding:neteq_tools_minimal",
"../rtc_base:ignore_wundef", "../rtc_base:ignore_wundef",
"../rtc_base:logging", "../rtc_base:logging",
"../rtc_base:macromagic", "../rtc_base:macromagic",