Separate build targets for aec3 and aec3_unittests
Bug: webrtc:8844
Change-Id: Id6a98eae19aaedc87c3f402a004f58f0290d5c28
Reviewed-on: https://webrtc-review.googlesource.com/56580
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22173}diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 0528479..6a1a3bb 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -35,84 +35,6 @@
"aec/aec_resampler.h",
"aec/echo_cancellation.cc",
"aec/echo_cancellation.h",
- "aec3/adaptive_fir_filter.cc",
- "aec3/adaptive_fir_filter.h",
- "aec3/aec3_common.cc",
- "aec3/aec3_common.h",
- "aec3/aec3_fft.cc",
- "aec3/aec3_fft.h",
- "aec3/aec_state.cc",
- "aec3/aec_state.h",
- "aec3/block_framer.cc",
- "aec3/block_framer.h",
- "aec3/block_processor.cc",
- "aec3/block_processor.h",
- "aec3/block_processor_metrics.cc",
- "aec3/block_processor_metrics.h",
- "aec3/cascaded_biquad_filter.cc",
- "aec3/cascaded_biquad_filter.h",
- "aec3/comfort_noise_generator.cc",
- "aec3/comfort_noise_generator.h",
- "aec3/decimator.cc",
- "aec3/decimator.h",
- "aec3/delay_estimate.h",
- "aec3/downsampled_render_buffer.cc",
- "aec3/downsampled_render_buffer.h",
- "aec3/echo_canceller3.cc",
- "aec3/echo_canceller3.h",
- "aec3/echo_path_delay_estimator.cc",
- "aec3/echo_path_delay_estimator.h",
- "aec3/echo_path_variability.cc",
- "aec3/echo_path_variability.h",
- "aec3/echo_remover.cc",
- "aec3/echo_remover.h",
- "aec3/echo_remover_metrics.cc",
- "aec3/echo_remover_metrics.h",
- "aec3/erl_estimator.cc",
- "aec3/erl_estimator.h",
- "aec3/erle_estimator.cc",
- "aec3/erle_estimator.h",
- "aec3/fft_buffer.cc",
- "aec3/fft_buffer.h",
- "aec3/fft_data.h",
- "aec3/frame_blocker.cc",
- "aec3/frame_blocker.h",
- "aec3/main_filter_update_gain.cc",
- "aec3/main_filter_update_gain.h",
- "aec3/matched_filter.cc",
- "aec3/matched_filter.h",
- "aec3/matched_filter_lag_aggregator.cc",
- "aec3/matched_filter_lag_aggregator.h",
- "aec3/matrix_buffer.cc",
- "aec3/matrix_buffer.h",
- "aec3/output_selector.cc",
- "aec3/output_selector.h",
- "aec3/render_buffer.cc",
- "aec3/render_buffer.h",
- "aec3/render_delay_buffer.cc",
- "aec3/render_delay_buffer.h",
- "aec3/render_delay_controller.cc",
- "aec3/render_delay_controller.h",
- "aec3/render_delay_controller_metrics.cc",
- "aec3/render_delay_controller_metrics.h",
- "aec3/render_signal_analyzer.cc",
- "aec3/render_signal_analyzer.h",
- "aec3/residual_echo_estimator.cc",
- "aec3/residual_echo_estimator.h",
- "aec3/shadow_filter_update_gain.cc",
- "aec3/shadow_filter_update_gain.h",
- "aec3/skew_estimator.cc",
- "aec3/skew_estimator.h",
- "aec3/subtractor.cc",
- "aec3/subtractor.h",
- "aec3/subtractor_output.h",
- "aec3/suppression_filter.cc",
- "aec3/suppression_filter.h",
- "aec3/suppression_gain.cc",
- "aec3/suppression_gain.h",
- "aec3/vector_buffer.cc",
- "aec3/vector_buffer.h",
- "aec3/vector_math.h",
"agc/agc.cc",
"agc/agc.h",
"agc/agc_manager_direct.cc",
@@ -221,8 +143,8 @@
":audio_processing_c",
":audio_processing_statistics",
"..:module_api",
+ "../..:typedefs",
"../..:webrtc_common",
- "../../:typedefs",
"../../api:array_view",
"../../api:optional",
"../../api/audio:aec3_config",
@@ -348,8 +270,8 @@
}
deps = [
+ "../..:typedefs",
"../..:webrtc_common",
- "../../:typedefs",
"../../common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks",
@@ -430,8 +352,8 @@
deps = [
":apm_logging",
":audio_processing_statistics",
+ "../..:typedefs",
"../..:webrtc_common",
- "../../:typedefs",
"../../common_audio:common_audio",
"../../common_audio:common_audio_c",
"../../rtc_base:checks",
@@ -543,10 +465,6 @@
sources = [
"aec/echo_cancellation_unittest.cc",
"aec/system_delay_unittest.cc",
- "aec3/mock/mock_block_processor.h",
- "aec3/mock/mock_echo_remover.h",
- "aec3/mock/mock_render_delay_buffer.h",
- "aec3/mock/mock_render_delay_controller.h",
"agc/agc_manager_direct_unittest.cc",
"agc/loudness_histogram_unittest.cc",
"agc/mock_agc.h",
@@ -585,8 +503,8 @@
":audioproc_test_utils",
":mocks",
"..:module_api",
+ "../..:typedefs",
"../..:webrtc_common",
- "../../:typedefs",
"../../api:array_view",
"../../api:optional",
"../../api/audio:aec3_config",
@@ -601,6 +519,7 @@
"../../system_wrappers:cpu_features_api",
"../../test:test_support",
"../audio_coding:neteq_input_audio_tools",
+ "aec3:aec3",
"aec_dump:mock_aec_dump_unittests",
"agc2:fixed_digital_unittests",
"test/conversational_speech:unittest",
@@ -638,40 +557,6 @@
"aec_dump:aec_dump_unittests",
]
sources += [
- "aec3/adaptive_fir_filter_unittest.cc",
- "aec3/aec3_fft_unittest.cc",
- "aec3/aec_state_unittest.cc",
- "aec3/block_framer_unittest.cc",
- "aec3/block_processor_metrics_unittest.cc",
- "aec3/block_processor_unittest.cc",
- "aec3/cascaded_biquad_filter_unittest.cc",
- "aec3/comfort_noise_generator_unittest.cc",
- "aec3/decimator_unittest.cc",
- "aec3/echo_canceller3_unittest.cc",
- "aec3/echo_path_delay_estimator_unittest.cc",
- "aec3/echo_path_variability_unittest.cc",
- "aec3/echo_remover_metrics_unittest.cc",
- "aec3/echo_remover_unittest.cc",
- "aec3/erl_estimator_unittest.cc",
- "aec3/erle_estimator_unittest.cc",
- "aec3/fft_data_unittest.cc",
- "aec3/frame_blocker_unittest.cc",
- "aec3/main_filter_update_gain_unittest.cc",
- "aec3/matched_filter_lag_aggregator_unittest.cc",
- "aec3/matched_filter_unittest.cc",
- "aec3/output_selector_unittest.cc",
- "aec3/render_buffer_unittest.cc",
- "aec3/render_delay_buffer_unittest.cc",
- "aec3/render_delay_controller_metrics_unittest.cc",
- "aec3/render_delay_controller_unittest.cc",
- "aec3/render_signal_analyzer_unittest.cc",
- "aec3/residual_echo_estimator_unittest.cc",
- "aec3/shadow_filter_update_gain_unittest.cc",
- "aec3/skew_estimator_unittest.cc",
- "aec3/subtractor_unittest.cc",
- "aec3/suppression_filter_unittest.cc",
- "aec3/suppression_gain_unittest.cc",
- "aec3/vector_math_unittest.cc",
"audio_processing_impl_locking_unittest.cc",
"audio_processing_impl_unittest.cc",
"audio_processing_unittest.cc",
@@ -775,6 +660,7 @@
"../../system_wrappers",
"../../system_wrappers:system_wrappers_default",
"../../test:test_support",
+ "aec3:aec3",
"aec_dump",
"aec_dump:aec_dump_impl",
"//testing/gtest",
@@ -823,8 +709,8 @@
deps = [
":audio_processing",
"..:module_api",
+ "../..:typedefs",
"../..:webrtc_common",
- "../../:typedefs",
"../../common_audio:common_audio",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
@@ -843,8 +729,8 @@
]
deps = [
":audio_processing",
+ "../..:typedefs",
"../..:webrtc_common",
- "../../:typedefs",
"../../system_wrappers",
"../../system_wrappers:metrics_default",
]
@@ -899,8 +785,8 @@
deps = [
":audioproc_debug_proto",
+ "../..:typedefs",
"../..:webrtc_common",
- "../../:typedefs",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
]