diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-18 18:25:10 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-18 18:25:10 +0000 |
| commit | 3b0632175a18102ed70646e79f0b4dd196ee6f8d (patch) | |
| tree | 11a2610cc326e08d6da9cab81e0c9dbcb76244c8 /ft2.target.linux-x86.mk | |
| parent | 207005caea600f695ee4fc8da874ed18d86fd67e (diff) | |
| download | freetype-3b0632175a18102ed70646e79f0b4dd196ee6f8d.tar.gz | |
Update makefiles after merge of Chromium at 257697
This commit was generated by merge_from_chromium.py.
Change-Id: I2a10bba0cb3abecd2b7e0bab0d87229ca819cb6e
Diffstat (limited to 'ft2.target.linux-x86.mk')
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 8810306..6f09969 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -93,7 +93,6 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=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' \ @@ -187,7 +186,6 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=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' \ |