Stop using public_deps in common_audio.

Bug: webrtc:8603
Change-Id: I315311977f2a75476a7028b8d3eaf3c98caf4178
Reviewed-on: https://webrtc-review.googlesource.com/47920
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21902}
This commit is contained in:
Mirko Bonadei
2018-02-05 15:50:41 +01:00
committed by Commit Bot
parent 6114c24384
commit dbbb33cd00
6 changed files with 22 additions and 7 deletions

View File

@ -58,6 +58,7 @@ rtc_static_library("audio") {
"../call:call_interfaces", "../call:call_interfaces",
"../call:rtp_interfaces", "../call:rtp_interfaces",
"../common_audio", "../common_audio",
"../common_audio:common_audio_c",
"../logging:rtc_event_audio", "../logging:rtc_event_audio",
"../logging:rtc_event_log_api", "../logging:rtc_event_log_api",
"../modules:module_api", "../modules:module_api",

View File

@ -60,6 +60,7 @@ rtc_static_library("common_audio") {
] ]
deps = [ deps = [
":common_audio_c",
":sinc_resampler", ":sinc_resampler",
"..:webrtc_common", "..:webrtc_common",
"../:typedefs", "../:typedefs",
@ -70,9 +71,6 @@ rtc_static_library("common_audio") {
"../system_wrappers", "../system_wrappers",
"../system_wrappers:cpu_features_api", "../system_wrappers:cpu_features_api",
] ]
public_deps = [
":common_audio_c",
]
defines = [] defines = []
if (rtc_use_openmax_dl) { if (rtc_use_openmax_dl) {
@ -136,6 +134,7 @@ rtc_source_set("common_audio_c_arm_asm") {
} }
rtc_source_set("common_audio_c") { rtc_source_set("common_audio_c") {
visibility += webrtc_default_visibility
sources = [ sources = [
"fft4g.c", "fft4g.c",
"fft4g.h", "fft4g.h",
@ -348,19 +347,17 @@ if (rtc_build_with_neon) {
} }
deps = [ deps = [
":common_audio_neon_c",
":fir_filter", ":fir_filter",
":sinc_resampler", ":sinc_resampler",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
"../system_wrappers", "../system_wrappers",
] ]
public_deps = [
":common_audio_neon_c",
]
} }
rtc_source_set("common_audio_neon_c") { rtc_source_set("common_audio_neon_c") {
visibility += webrtc_default_visibility
sources = [ sources = [
"signal_processing/cross_correlation_neon.c", "signal_processing/cross_correlation_neon.c",
"signal_processing/downsample_fast_neon.c", "signal_processing/downsample_fast_neon.c",
@ -447,6 +444,7 @@ if (rtc_include_tests) {
deps = [ deps = [
":common_audio", ":common_audio",
":common_audio_c",
":fir_filter", ":fir_filter",
":fir_filter_factory", ":fir_filter_factory",
":sinc_resampler", ":sinc_resampler",

View File

@ -136,6 +136,7 @@ rtc_static_library("audio_coding") {
} }
deps = audio_coding_deps + [ deps = audio_coding_deps + [
"../../common_audio:common_audio_c",
"../..:typedefs", "../..:typedefs",
"../../rtc_base:deprecation", "../../rtc_base:deprecation",
"../../rtc_base:checks", "../../rtc_base:checks",
@ -187,6 +188,7 @@ rtc_static_library("cng") {
"../../api:array_view", "../../api:array_view",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
] ]
} }
@ -473,6 +475,7 @@ rtc_source_set("ilbc_c") {
"../..:webrtc_common", "../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
"../../rtc_base:sanitizer", "../../rtc_base:sanitizer",
@ -586,6 +589,7 @@ rtc_static_library("isac_c") {
"../..:typedefs", "../..:typedefs",
"../..:webrtc_common", "../..:webrtc_common",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:compile_assert_c", "../../rtc_base:compile_assert_c",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
@ -635,6 +639,7 @@ rtc_source_set("isac_fix_common") {
":isac_common", ":isac_common",
"../..:typedefs", "../..:typedefs",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
] ]
} }
@ -703,6 +708,7 @@ rtc_source_set("isac_fix_c") {
"../..:webrtc_common", "../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:compile_assert_c", "../../rtc_base:compile_assert_c",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
@ -781,6 +787,7 @@ if (rtc_build_with_neon) {
deps = [ deps = [
":isac_fix_common", ":isac_fix_common",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
] ]
@ -1076,6 +1083,7 @@ rtc_static_library("neteq") {
"../../api:optional", "../../api:optional",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:gtest_prod", "../../rtc_base:gtest_prod",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
@ -2037,6 +2045,7 @@ if (rtc_include_tests) {
":isac", ":isac",
":isac_test_util", ":isac_test_util",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
] ]
include_dirs = [ include_dirs = [
@ -2193,6 +2202,7 @@ if (rtc_include_tests) {
"../../api/audio_codecs/opus:audio_decoder_opus", "../../api/audio_codecs/opus:audio_decoder_opus",
"../../api/audio_codecs/opus:audio_encoder_opus", "../../api/audio_codecs/opus:audio_encoder_opus",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../common_audio:mock_common_audio", "../../common_audio:mock_common_audio",
"../../logging:mocks", "../../logging:mocks",
"../../logging:rtc_event_audio", "../../logging:rtc_event_audio",

View File

@ -107,6 +107,7 @@ rtc_source_set("audio_device_generic") {
"../../:typedefs", "../../:typedefs",
"../../api:array_view", "../../api:array_view",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:deprecation", "../../rtc_base:deprecation",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",

View File

@ -224,6 +224,7 @@ rtc_static_library("audio_processing") {
"../../api:array_view", "../../api:array_view",
"../../api:optional", "../../api:optional",
"../../audio/utility:audio_frame_operations", "../../audio/utility:audio_frame_operations",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:deprecation", "../../rtc_base:deprecation",
"../../rtc_base:gtest_prod", "../../rtc_base:gtest_prod",
@ -335,6 +336,7 @@ rtc_source_set("audio_processing_c") {
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../common_audio", "../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
"../../system_wrappers:cpu_features_api", "../../system_wrappers:cpu_features_api",
@ -416,6 +418,7 @@ rtc_source_set("aec_core") {
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../common_audio:common_audio", "../../common_audio:common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
"../../rtc_base:sanitizer", "../../rtc_base:sanitizer",
@ -569,6 +572,7 @@ if (rtc_include_tests) {
"../../api:array_view", "../../api:array_view",
"../../api:optional", "../../api:optional",
"../../common_audio:common_audio", "../../common_audio:common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:gtest_prod", "../../rtc_base:gtest_prod",
"../../rtc_base:protobuf_utils", "../../rtc_base:protobuf_utils",

View File

@ -39,6 +39,7 @@ rtc_static_library("vad") {
"../../..:typedefs", "../../..:typedefs",
"../../../audio/utility:audio_frame_operations", "../../../audio/utility:audio_frame_operations",
"../../../common_audio", "../../../common_audio",
"../../../common_audio:common_audio_c",
"../../../rtc_base:checks", "../../../rtc_base:checks",
"../../audio_coding:isac", "../../audio_coding:isac",
] ]