diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-08 14:21:46 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-08 14:21:46 +0000 |
| commit | 2a5d481b5e821cff61bbdb7925603e551e9bdec1 (patch) | |
| tree | 1f77d3903c347a8f89198cc4d70003edc1d95eb2 /common_audio/common_audio.target.linux-arm.mk | |
| parent | a0c16d2d59f7bb3874b7ded91411f064acddaeed (diff) | |
| download | webrtc-2a5d481b5e821cff61bbdb7925603e551e9bdec1.tar.gz | |
Update makefiles after merge of Chromium at b415a9063014
This commit was generated by merge_from_chromium.py.
Change-Id: I7f50ecd9ae7e0eddc2c072b6eac49c0720d1002d
Diffstat (limited to 'common_audio/common_audio.target.linux-arm.mk')
| -rw-r--r-- | common_audio/common_audio.target.linux-arm.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/common_audio/common_audio.target.linux-arm.mk b/common_audio/common_audio.target.linux-arm.mk index 4fe74228..bca3ee30 100644 --- a/common_audio/common_audio.target.linux-arm.mk +++ b/common_audio/common_audio.target.linux-arm.mk @@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/audio_util.cc \ + third_party/webrtc/common_audio/blocker.cc \ third_party/webrtc/common_audio/fir_filter.cc \ third_party/webrtc/common_audio/resampler/push_resampler.cc \ third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \ @@ -67,6 +68,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_sp.c \ third_party/webrtc/common_audio/wav_header.cc \ third_party/webrtc/common_audio/wav_writer.cc \ + third_party/webrtc/common_audio/window_generator.cc \ + third_party/webrtc/common_audio/lapped_transform.cc \ + third_party/webrtc/common_audio/real_fourier.cc \ third_party/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S \ third_party/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S \ third_party/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S @@ -148,6 +152,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DDL_ARM_NEON_OPTIONAL' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -171,6 +176,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -266,6 +272,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DDL_ARM_NEON_OPTIONAL' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -290,6 +297,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ + $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport |