summaryrefslogtreecommitdiff
path: root/openssl.target.darwin-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-18 18:25:11 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-18 18:25:11 +0000
commit8c0150a91f2318cc760097ae13b18554a9a0f29c (patch)
tree1cab9ad96c79f5049c8e0ae6ff0f422b42509073 /openssl.target.darwin-mips.mk
parent2c36914c1658aca20a7bc635e616150cd0fd881c (diff)
downloadopenssl-8c0150a91f2318cc760097ae13b18554a9a0f29c.tar.gz
Update makefiles after merge of Chromium at 257697
This commit was generated by merge_from_chromium.py. Change-Id: Ie4038192d3908d7ec68109384a2dd937bc1e8de7
Diffstat (limited to 'openssl.target.darwin-mips.mk')
-rw-r--r--openssl.target.darwin-mips.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 41a3169..d42f229 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -627,7 +627,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' \
@@ -727,7 +726,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' \