summaryrefslogtreecommitdiff
path: root/system_wrappers/source/cpu_features_android.target.darwin-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-03 11:50:48 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-03 11:50:48 +0000
commit6038f4cd8a4f02edb273dd4efdf3602fa1318efe (patch)
tree240060fc3b463a44627d7e47a46bcb247f877a36 /system_wrappers/source/cpu_features_android.target.darwin-mips.mk
parentc05f045d763a86ddae3193e5d08ff72016ddfd17 (diff)
downloadwebrtc-6038f4cd8a4f02edb273dd4efdf3602fa1318efe.tar.gz
Update makefiles after merge of Chromium at 274467
This commit was generated by merge_from_chromium.py. Change-Id: Iefab95a41a20f3168e99058b4bb2c8bdeea517b1
Diffstat (limited to 'system_wrappers/source/cpu_features_android.target.darwin-mips.mk')
-rw-r--r--system_wrappers/source/cpu_features_android.target.darwin-mips.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk
index b12f805b..03121126 100644
--- a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk
+++ b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk
@@ -77,7 +77,6 @@ MY_DEFS_Debug := \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
- '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
@@ -185,7 +184,6 @@ MY_DEFS_Release := \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
- '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \