summaryrefslogtreecommitdiff
path: root/libvpx.target.linux-x86_64.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-28 13:29:10 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-28 13:29:10 +0000
commit0233fcdb74d4561ef36958d725002f2ec18f0cb5 (patch)
treebd4f3980d3f0d87119a0d4d8d07ee0340d494a93 /libvpx.target.linux-x86_64.mk
parent336d3fd2c3e65a41db0e003be78916eabecaf780 (diff)
downloadlibvpx-0233fcdb74d4561ef36958d725002f2ec18f0cb5.tar.gz
Update makefiles after merge of Chromium at 273199
This commit was generated by merge_from_chromium.py. Change-Id: Ib644473033d2046f1bcd2cdeaf455159cc739680
Diffstat (limited to 'libvpx.target.linux-x86_64.mk')
-rw-r--r--libvpx.target.linux-x86_64.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvpx.target.linux-x86_64.mk b/libvpx.target.linux-x86_64.mk
index a0c605e..a99277f 100644
--- a/libvpx.target.linux-x86_64.mk
+++ b/libvpx.target.linux-x86_64.mk
@@ -884,6 +884,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' \
'-DENABLE_EGLIMAGE=1' \
@@ -981,6 +982,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' \
'-DENABLE_EGLIMAGE=1' \