summaryrefslogtreecommitdiff
path: root/libvpx_obj_int_extract.host.linux-x86.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
commitc8d2b951ae3dce6c02439169dc5e6ebf2b9b5a00 (patch)
treeb6d5d7bee336a2e72667739d6d76c76ddf71ffd6 /libvpx_obj_int_extract.host.linux-x86.mk
parent03c975744c1acf41bf2517fd5d757706d20db18f (diff)
downloadlibvpx-c8d2b951ae3dce6c02439169dc5e6ebf2b9b5a00.tar.gz
Update makefiles after merge of Chromium at 253634
This commit was generated by merge_from_chromium.py. Change-Id: Ia11c78e318174e9c41840b5b68c37fc3aa6137f8
Diffstat (limited to 'libvpx_obj_int_extract.host.linux-x86.mk')
-rw-r--r--libvpx_obj_int_extract.host.linux-x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk
index 15b8190..2599517 100644
--- a/libvpx_obj_int_extract.host.linux-x86.mk
+++ b/libvpx_obj_int_extract.host.linux-x86.mk
@@ -57,6 +57,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' \
@@ -114,6 +115,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' \