Update makefiles after merge of Chromium at 287308
This commit was generated by merge_from_chromium.py.
Change-Id: I85bf9681e9c3bbef9f67d93b3d275289e6911e3c
diff --git a/modules/iSACFix.target.darwin-arm.mk b/modules/iSACFix.target.darwin-arm.mk
index ce94090..828492f 100644
--- a/modules/iSACFix.target.darwin-arm.mk
+++ b/modules/iSACFix.target.darwin-arm.mk
@@ -42,11 +42,13 @@
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_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_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S
@@ -116,7 +118,6 @@
'-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/"' \
@@ -246,7 +247,6 @@
'-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/"' \