Index: webrtc/modules/audio_processing/BUILD.gn |
diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn |
index 5ba9f3e42cb41b40569edbd233280bcd6e83ada5..6ad77750a55c24d9addf69b240069eb48cbb2ae8 100644 |
--- a/webrtc/modules/audio_processing/BUILD.gn |
+++ b/webrtc/modules/audio_processing/BUILD.gn |
@@ -161,6 +161,7 @@ rtc_static_library("audio_processing") { |
deps = [ |
"../..:webrtc_common", |
"../../audio/utility:audio_frame_operations", |
+ "../../base:gtest_prod", |
"../audio_coding:isac", |
] |
public_deps = [ |
@@ -265,6 +266,7 @@ rtc_source_set("audio_processing_c") { |
} |
deps = [ |
+ "../..:webrtc_common", |
"../../base:rtc_base_approved", |
"../../common_audio", |
"../../system_wrappers", |
@@ -283,6 +285,10 @@ if (rtc_enable_protobuf) { |
if (current_cpu == "x86" || current_cpu == "x64") { |
rtc_static_library("audio_processing_sse2") { |
+ # TODO(ehmaldonado): Remove (bugs.webrtc.org/6828) |
+ # Errors on cyclic dependency with :audio_processing if enabled. |
+ check_includes = false |
+ |
sources = [ |
"aec/aec_core_sse2.cc", |
"utility/ooura_fft_sse2.cc", |
@@ -303,6 +309,10 @@ if (current_cpu == "x86" || current_cpu == "x64") { |
if (rtc_build_with_neon) { |
rtc_static_library("audio_processing_neon") { |
+ # TODO(ehmaldonado): Remove (bugs.webrtc.org/6828) |
+ # Errors on cyclic dependency with :audio_processing if enabled. |
+ check_includes = false |
+ |
sources = [ |
"aec/aec_core_neon.cc", |
"aecm/aecm_core_neon.cc", |
@@ -362,6 +372,10 @@ if (rtc_build_with_neon) { |
"-ffat-lto-objects", |
] |
} |
+ deps = [ |
+ ":audio_processing_c", |
+ "../../base:rtc_base_approved", |
+ ] |
} |
} |
@@ -397,6 +411,8 @@ if (rtc_include_tests) { |
":audioproc_debug_proto", |
":audioproc_protobuf_utils", |
":audioproc_test_utils", |
+ "../..:webrtc_common", |
+ "../../base:rtc_base_approved", |
"../../common_audio", |
"../../system_wrappers:system_wrappers_default", |
"//third_party/gflags:gflags", |
@@ -420,6 +436,8 @@ if (rtc_include_tests) { |
":audioproc_debug_proto", |
":audioproc_protobuf_utils", |
":audioproc_test_utils", |
+ "../../base:rtc_base_approved", |
+ "../../common_audio:common_audio", |
"../../system_wrappers", |
"../../system_wrappers:system_wrappers_default", |
"../../test:test_support", |
@@ -442,8 +460,10 @@ if (rtc_include_tests) { |
] |
deps = [ |
+ ":audio_processing", |
"../../base:rtc_base_approved", |
"../../common_audio", |
+ "../../system_wrappers:system_wrappers", |
] |
} |
@@ -456,7 +476,10 @@ if (rtc_include_tests) { |
] |
deps = [ |
":audio_processing", |
+ "../..:webrtc_common", |
+ "../../common_audio:common_audio", |
"../../system_wrappers:metrics_default", |
+ "../../system_wrappers:system_wrappers", |
"../../test:test_support", |
"//testing/gtest", |
"//third_party/gflags", |
@@ -472,7 +495,9 @@ if (rtc_include_tests) { |
] |
deps = [ |
":audio_processing", |
+ "../..:webrtc_common", |
"../../system_wrappers:metrics_default", |
+ "../../system_wrappers:system_wrappers", |
] |
} |
@@ -484,6 +509,8 @@ if (rtc_include_tests) { |
deps = [ |
":audio_processing", |
":audioproc_test_utils", |
+ "../../base:rtc_base_approved", |
+ "../../common_audio:common_audio", |
"../../system_wrappers:metrics_default", |
"//third_party/gflags", |
] |
@@ -522,6 +549,8 @@ if (rtc_include_tests) { |
deps = [ |
":audioproc_debug_proto", |
+ "../..:webrtc_common", |
+ "../../base:rtc_base_approved", |
] |
} |
} |