diff options
author | Andy Hung <hunga@google.com> | 2020-11-17 21:23:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-17 21:23:31 +0000 |
commit | ce4d27c613e22718967ac17ad553224f56a20ec0 (patch) | |
tree | 4643ba3a23a7e294529fa7b8239d0d3ecc0867e7 | |
parent | 05f5c2bd3b7c3f53276d3c728937f38e8a09c1eb (diff) | |
parent | 2e0eb20ede87907d8d1ae19454bf23e9afe99329 (diff) | |
download | webrtc-ce4d27c613e22718967ac17ad553224f56a20ec0.tar.gz |
Merge "Update Android.bp" am: 34d005edd3 am: 11c13ea7f8 am: 2e0eb20ede
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1498102
Change-Id: I9e14e3456b0786e4c01347326d5775d23ec167e3
-rw-r--r-- | Android.bp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index 96380d6978..22b2b41a28 100644 --- a/Android.bp +++ b/Android.bp @@ -2633,11 +2633,6 @@ cc_library_static { ], } -filegroup { - name: "webrtc_audio_processing__aec_dump_interface", - srcs: ["modules/audio_processing/include/aec_dump.cc"], -} - cc_library_static { name: "webrtc_audio_processing__voice_detection", defaults: ["webrtc_defaults"], @@ -3338,7 +3333,7 @@ cc_library_static { defaults: ["webrtc_defaults"], srcs: [ "modules/audio_processing/aec_dump/null_aec_dump_factory.cc", - ":webrtc_audio_processing__aec_dump_interface", + "modules/audio_processing/include/aec_dump.cc", ], host_supported: true, } @@ -3410,7 +3405,6 @@ cc_library_static { "modules/audio_processing/residual_echo_detector.cc", "modules/audio_processing/typing_detection.cc", ":webrtc_audio_processing__rms_level", - ":webrtc_audio_processing__aec_dump_interface", ], host_supported: true, cflags: ["-DWEBRTC_APM_DEBUG_DUMP=0"], @@ -5501,7 +5495,6 @@ cc_library_static { ":webrtc_transport__stun_types", ":webrtc_neteq__neteq_api", ":webrtc_video__video_frame_metadata", - ":webrtc_audio_processing__aec_dump_interface", ":webrtc_neteq__default_neteq_controller_factory", ":webrtc_audio_coding__default_neteq_factory", ":webrtc_video_capture__video_capture_internal_impl", @@ -5523,6 +5516,7 @@ cc_library_static { "webrtc_rtc_base__checks", "webrtc_synchronization__mutex", "webrtc_audio_processing__config", + "webrtc_system__file_wrapper", "webrtc_system_wrappers__field_trial", "webrtc_rtc_base__rtc_base_approved", "webrtc_system_wrappers__system_wrappers", @@ -5560,6 +5554,9 @@ cc_library_static { "webrtc_rtc_base__timeutils", "webrtc_system_wrappers__cpu_features_linux", "webrtc_synchronization__rw_lock_wrapper", + "webrtc_units__data_rate", + "webrtc_units__data_size", + "webrtc_units__time_delta", "webrtc_units__timestamp", "webrtc_rtc_base__rtc_numerics", "webrtc_agc__level_estimation", @@ -5582,6 +5579,7 @@ cc_library_static { "webrtc_spl_sqrt_floor__spl_sqrt_floor", "webrtc_common_audio__common_audio_cc", "webrtc_transient__transient_suppressor_impl", + "webrtc_synchronization__yield", "webrtc_synchronization__yield_policy", ], } |