diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-24 13:49:09 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-24 13:49:09 +0000 |
| commit | 6ccf28cae84e55e2f367a1dc4cf80c47c69b949f (patch) | |
| tree | 4a59a48d51cd0e1deb717f81cdd670d10288d344 /ots.target.linux-x86.mk | |
| parent | f5da723444ae62fd5e5ce3ca7bbd1dc725ee3d75 (diff) | |
| download | ots-6ccf28cae84e55e2f367a1dc4cf80c47c69b949f.tar.gz | |
Update makefiles after merge of Chromium at 272740
This commit was generated by merge_from_chromium.py.
Change-Id: Ibacf3ba802a3cebdf4434d85c17504aa8440501c
Diffstat (limited to 'ots.target.linux-x86.mk')
| -rw-r--r-- | ots.target.linux-x86.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index b4301ab..6c3f6bc 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -104,6 +104,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' \ @@ -196,6 +197,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' \ |