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-02-26 23:46:14 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-02-26 23:46:14 +0000
commit25d0aaaa280dc79b6968c56d8510b0861c4e1b5a (patch)
tree43f975d124ae1dbdd604c349171e20cb7d4b5859 /system_wrappers/source/cpu_features_android.target.linux-arm.mk
parent643b9b818fe6d25669cb80d703ab9e84e0d882e7 (diff)
downloadwebrtc-25d0aaaa280dc79b6968c56d8510b0861c4e1b5a.tar.gz
Update makefiles after merge of Chromium at 253634
This commit was generated by merge_from_chromium.py. Change-Id: Ibe2e1b7a23711055ff2fbc630881306a4c4d928d
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, 2 insertions, 0 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 5a92a534..88496e35 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
@@ -74,6 +74,7 @@ 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' \
'-DUSE_OPENSSL=1' \
@@ -171,6 +172,7 @@ 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' \
'-DUSE_OPENSSL=1' \