summaryrefslogtreecommitdiff
path: root/system_wrappers/source/cpu_features_android.target.linux-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-08-12 12:08:48 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-08-12 12:08:48 +0000
commit5f192429a0cef706ec6e903d99130b9623db8c02 (patch)
treec425e3d37100dfe4eb8b4cc92b0bdbeee0d11aab /system_wrappers/source/cpu_features_android.target.linux-arm.mk
parentfebc61330dc628035ca5cb7443c195e44657edec (diff)
downloadwebrtc-5f192429a0cef706ec6e903d99130b9623db8c02.tar.gz
Update makefiles after merge of Chromium at 288938
This commit was generated by merge_from_chromium.py. Change-Id: Ic0141d5da4e1ab26e23ffa3c860ea955981acdb0
Diffstat (limited to 'system_wrappers/source/cpu_features_android.target.linux-arm.mk')
-rw-r--r--system_wrappers/source/cpu_features_android.target.linux-arm.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
index 72b0a357..50c80b08 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
@@ -73,7 +73,6 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -192,7 +191,6 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \