summaryrefslogtreecommitdiff
path: root/common_audio/common_audio.target.darwin-x86.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 /common_audio/common_audio.target.darwin-x86.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 'common_audio/common_audio.target.darwin-x86.mk')
-rw-r--r--common_audio/common_audio.target.darwin-x86.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/common_audio/common_audio.target.darwin-x86.mk b/common_audio/common_audio.target.darwin-x86.mk
index cdf5ac1b..345ee3e6 100644
--- a/common_audio/common_audio.target.darwin-x86.mk
+++ b/common_audio/common_audio.target.darwin-x86.mk
@@ -127,7 +127,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/"' \
@@ -241,7 +240,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/"' \