diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-24 13:49:11 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-24 13:49:11 +0000 |
| commit | f290b35b0236643f60a56c40047bbb5c683607d5 (patch) | |
| tree | 6d2d4c38419c33dfd6de37b4b6b6545051f133ca /voice_engine/voice_engine.target.darwin-mips.mk | |
| parent | 271bf09ce755bf3e20f3a433f7c670e2a7ac4b0c (diff) | |
| download | webrtc-f290b35b0236643f60a56c40047bbb5c683607d5.tar.gz | |
Update makefiles after merge of Chromium at 272740
This commit was generated by merge_from_chromium.py.
Change-Id: I193a8a178b0e7da4d04fc4068510d6e055907ada
Diffstat (limited to 'voice_engine/voice_engine.target.darwin-mips.mk')
| -rw-r--r-- | voice_engine/voice_engine.target.darwin-mips.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk index 9280e4bf..6e12281b 100644 --- a/voice_engine/voice_engine.target.darwin-mips.mk +++ b/voice_engine/voice_engine.target.darwin-mips.mk @@ -101,6 +101,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' \ @@ -218,6 +219,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' \ |