aboutsummaryrefslogtreecommitdiff
path: root/ots.target.linux-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-02-26 23:46:13 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-02-26 23:46:13 +0000
commit9285d7b3acbc07e5aab5ae06ca42c0d8ac464286 (patch)
treee64868174783d598591ddff7a49858720e3fe648 /ots.target.linux-arm.mk
parent05bc262ec6ebfd85a72a1f3f36fce55e213bbba1 (diff)
downloadots-9285d7b3acbc07e5aab5ae06ca42c0d8ac464286.tar.gz
Update makefiles after merge of Chromium at 253634
This commit was generated by merge_from_chromium.py. Change-Id: I97cdac36a24ce3c57e61712c19b75bbd3f41ffac
Diffstat (limited to 'ots.target.linux-arm.mk')
-rw-r--r--ots.target.linux-arm.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 5890ae1..dc2e0f6 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -101,6 +101,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' \
@@ -186,6 +187,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' \