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 | 8358ead68ac219c958ad4ebb39df8b5553c0e2ca (patch) | |
| tree | 0ee6578ad2e712760363e6dd2c9f8b242cebfdf3 /ft2.target.darwin-arm.mk | |
| parent | 0f774d123b76a767714e46dd82049af5478155ce (diff) | |
| download | freetype-8358ead68ac219c958ad4ebb39df8b5553c0e2ca.tar.gz | |
Update makefiles after merge of Chromium at 274467
This commit was generated by merge_from_chromium.py.
Change-Id: Idbe78e8c2d85bf123dc5ba0ff8b909ad09f59832
Diffstat (limited to 'ft2.target.darwin-arm.mk')
| -rw-r--r-- | ft2.target.darwin-arm.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index bc4479f..f4ed6c9 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -100,7 +100,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' \ @@ -207,7 +206,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' \ |