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 | 8748c0dac708f2345ee3854291937091a0c9d1ca (patch) | |
tree | ff20cab17aef47394bfcc1a1be85410122205383 /dl/openmax_dl_armv7.target.linux-arm.mk | |
parent | f4e9f7e256cbfeea42de656ff332f9ff1fd68b09 (diff) | |
download | openmax_dl-8748c0dac708f2345ee3854291937091a0c9d1ca.tar.gz |
Update makefiles after merge of Chromium at 274467
This commit was generated by merge_from_chromium.py.
Change-Id: I599dcd16db0911c88cc02db3e8488f1e626bc95d
Diffstat (limited to 'dl/openmax_dl_armv7.target.linux-arm.mk')
-rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index 1318137..ffbfd83 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -90,7 +90,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' \ @@ -189,7 +188,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' \ |