summaryrefslogtreecommitdiff
path: root/modules/iSACFix.target.darwin-arm64.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-08-04 09:24:42 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-08-04 09:24:42 +0000
commit8661714f95315bd471674b14e682aa6991eb370f (patch)
tree7451e68ab8bb0edaedcadb34934faf90e9df7e23 /modules/iSACFix.target.darwin-arm64.mk
parentfa5085428e6672f7f9e88a652e3c4a7f9c93d116 (diff)
downloadwebrtc-8661714f95315bd471674b14e682aa6991eb370f.tar.gz
Update makefiles after merge of Chromium at 287308
This commit was generated by merge_from_chromium.py. Change-Id: I85bf9681e9c3bbef9f67d93b3d275289e6911e3c
Diffstat (limited to 'modules/iSACFix.target.darwin-arm64.mk')
-rw-r--r--modules/iSACFix.target.darwin-arm64.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/iSACFix.target.darwin-arm64.mk b/modules/iSACFix.target.darwin-arm64.mk
index acb6482b..f6960e0f 100644
--- a/modules/iSACFix.target.darwin-arm64.mk
+++ b/modules/iSACFix.target.darwin-arm64.mk
@@ -43,12 +43,14 @@ LOCAL_SRC_FILES := \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c \
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c \
- third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c \
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_tables.c
# Flags passed to both C and C++ files.
@@ -105,7 +107,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -220,7 +221,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \