diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-03 11:50:47 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-03 11:50:47 +0000 |
commit | 2c7555d9cd195ea90818937cafab0784db337694 (patch) | |
tree | f9e76b51f095ff6b699fb8d6e5ee29edb56fd8f3 /gen_asm_offsets_vp8.target.linux-arm.mk | |
parent | b43e9a6c0ced53d64d0de10dc608d8ea5fba5aca (diff) | |
download | libvpx-2c7555d9cd195ea90818937cafab0784db337694.tar.gz |
Update makefiles after merge of Chromium at 274467
This commit was generated by merge_from_chromium.py.
Change-Id: I40c1e8bf2b2cbc44169cfae8053a0d8749982d8c
Diffstat (limited to 'gen_asm_offsets_vp8.target.linux-arm.mk')
-rw-r--r-- | gen_asm_offsets_vp8.target.linux-arm.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gen_asm_offsets_vp8.target.linux-arm.mk b/gen_asm_offsets_vp8.target.linux-arm.mk index fd00b42..3e5483c 100644 --- a/gen_asm_offsets_vp8.target.linux-arm.mk +++ b/gen_asm_offsets_vp8.target.linux-arm.mk @@ -110,7 +110,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' \ @@ -208,7 +207,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' \ |