diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-02-26 23:46:12 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-02-26 23:46:12 +0000 |
commit | 11fb23970fef92ab630f6471a15fd961b66f2e48 (patch) | |
tree | 446e60189249d1365cdfffece9eb3403cd54dbf8 /ft2.target.darwin-x86.mk | |
parent | f5d3b34f87203440155c83fd71454313cf707c2d (diff) | |
download | freetype-11fb23970fef92ab630f6471a15fd961b66f2e48.tar.gz |
Update makefiles after merge of Chromium at 253634
This commit was generated by merge_from_chromium.py.
Change-Id: I2842e726cba7e6f87c572e954f82c317775a26ed
Diffstat (limited to 'ft2.target.darwin-x86.mk')
-rw-r--r-- | ft2.target.darwin-x86.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index b9c8f08..9bbf9e4 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -94,6 +94,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' \ @@ -188,6 +189,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' \ |