From dbbb33cd0094ff4f24b42f3087d0587cd070ee0c Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 5 Feb 2018 15:50:41 +0100 Subject: [PATCH] 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 Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#21902} --- audio/BUILD.gn | 1 + common_audio/BUILD.gn | 12 +++++------- modules/audio_coding/BUILD.gn | 10 ++++++++++ modules/audio_device/BUILD.gn | 1 + modules/audio_processing/BUILD.gn | 4 ++++ modules/audio_processing/vad/BUILD.gn | 1 + 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 84cf6bcec9..f6a30bac8f 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -58,6 +58,7 @@ rtc_static_library("audio") { "../call:call_interfaces", "../call:rtp_interfaces", "../common_audio", + "../common_audio:common_audio_c", "../logging:rtc_event_audio", "../logging:rtc_event_log_api", "../modules:module_api", diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn index 926a85fd21..3d6109a332 100644 --- a/common_audio/BUILD.gn +++ b/common_audio/BUILD.gn @@ -60,6 +60,7 @@ rtc_static_library("common_audio") { ] deps = [ + ":common_audio_c", ":sinc_resampler", "..:webrtc_common", "../:typedefs", @@ -70,9 +71,6 @@ rtc_static_library("common_audio") { "../system_wrappers", "../system_wrappers:cpu_features_api", ] - public_deps = [ - ":common_audio_c", - ] defines = [] if (rtc_use_openmax_dl) { @@ -136,6 +134,7 @@ rtc_source_set("common_audio_c_arm_asm") { } rtc_source_set("common_audio_c") { + visibility += webrtc_default_visibility sources = [ "fft4g.c", "fft4g.h", @@ -348,19 +347,17 @@ if (rtc_build_with_neon) { } deps = [ + ":common_audio_neon_c", ":fir_filter", ":sinc_resampler", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../system_wrappers", ] - - public_deps = [ - ":common_audio_neon_c", - ] } rtc_source_set("common_audio_neon_c") { + visibility += webrtc_default_visibility sources = [ "signal_processing/cross_correlation_neon.c", "signal_processing/downsample_fast_neon.c", @@ -447,6 +444,7 @@ if (rtc_include_tests) { deps = [ ":common_audio", + ":common_audio_c", ":fir_filter", ":fir_filter_factory", ":sinc_resampler", diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index c9c5ff1328..639899ddfc 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -136,6 +136,7 @@ rtc_static_library("audio_coding") { } deps = audio_coding_deps + [ + "../../common_audio:common_audio_c", "../..:typedefs", "../../rtc_base:deprecation", "../../rtc_base:checks", @@ -187,6 +188,7 @@ rtc_static_library("cng") { "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", "../../common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:rtc_base_approved", ] } @@ -473,6 +475,7 @@ rtc_source_set("ilbc_c") { "../..:webrtc_common", "../../api/audio_codecs:audio_codecs_api", "../../common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:sanitizer", @@ -586,6 +589,7 @@ rtc_static_library("isac_c") { "../..:typedefs", "../..:webrtc_common", "../../common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:compile_assert_c", "../../rtc_base:rtc_base_approved", @@ -635,6 +639,7 @@ rtc_source_set("isac_fix_common") { ":isac_common", "../..:typedefs", "../../common_audio", + "../../common_audio:common_audio_c", ] } @@ -703,6 +708,7 @@ rtc_source_set("isac_fix_c") { "../..:webrtc_common", "../../api/audio_codecs:audio_codecs_api", "../../common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:compile_assert_c", "../../rtc_base:rtc_base_approved", @@ -781,6 +787,7 @@ if (rtc_build_with_neon) { deps = [ ":isac_fix_common", "../../common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", ] @@ -1076,6 +1083,7 @@ rtc_static_library("neteq") { "../../api:optional", "../../api/audio_codecs:audio_codecs_api", "../../common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:gtest_prod", "../../rtc_base:rtc_base_approved", @@ -2037,6 +2045,7 @@ if (rtc_include_tests) { ":isac", ":isac_test_util", "../../common_audio", + "../../common_audio:common_audio_c", ] include_dirs = [ @@ -2193,6 +2202,7 @@ if (rtc_include_tests) { "../../api/audio_codecs/opus:audio_decoder_opus", "../../api/audio_codecs/opus:audio_encoder_opus", "../../common_audio", + "../../common_audio:common_audio_c", "../../common_audio:mock_common_audio", "../../logging:mocks", "../../logging:rtc_event_audio", diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn index 3efab79bcf..11ac8a8d5d 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -107,6 +107,7 @@ rtc_source_set("audio_device_generic") { "../../:typedefs", "../../api:array_view", "../../common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:deprecation", "../../rtc_base:rtc_base_approved", diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn index 5aad38b754..ddabdb318a 100644 --- a/modules/audio_processing/BUILD.gn +++ b/modules/audio_processing/BUILD.gn @@ -224,6 +224,7 @@ rtc_static_library("audio_processing") { "../../api:array_view", "../../api:optional", "../../audio/utility:audio_frame_operations", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:deprecation", "../../rtc_base:gtest_prod", @@ -335,6 +336,7 @@ rtc_source_set("audio_processing_c") { "../..:webrtc_common", "../../:typedefs", "../../common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../system_wrappers:cpu_features_api", @@ -416,6 +418,7 @@ rtc_source_set("aec_core") { "../..:webrtc_common", "../../:typedefs", "../../common_audio:common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:sanitizer", @@ -569,6 +572,7 @@ if (rtc_include_tests) { "../../api:array_view", "../../api:optional", "../../common_audio:common_audio", + "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:gtest_prod", "../../rtc_base:protobuf_utils", diff --git a/modules/audio_processing/vad/BUILD.gn b/modules/audio_processing/vad/BUILD.gn index c924d5e167..b7363e386f 100644 --- a/modules/audio_processing/vad/BUILD.gn +++ b/modules/audio_processing/vad/BUILD.gn @@ -39,6 +39,7 @@ rtc_static_library("vad") { "../../..:typedefs", "../../../audio/utility:audio_frame_operations", "../../../common_audio", + "../../../common_audio:common_audio_c", "../../../rtc_base:checks", "../../audio_coding:isac", ]