summaryrefslogtreecommitdiff
path: root/openssl.target.linux-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-06-12 19:37:13 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-06-12 19:37:13 +0000
commit900af0f0806482e9498ec29698030f4c54e52a36 (patch)
tree17c5861cbc5be185b99be5371f78ff40c69063ee /openssl.target.linux-arm.mk
parent63f507926cf47137fd70b582b67c5c25f4d2891b (diff)
downloadopenssl-900af0f0806482e9498ec29698030f4c54e52a36.tar.gz
Update makefiles after merge of Chromium at r205892
This commit was generated by merge_from_chromium.py. Change-Id: Ib9e121c26835a594d012a1222f175983af94109e
Diffstat (limited to 'openssl.target.linux-arm.mk')
-rw-r--r--openssl.target.linux-arm.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 0cd2c23..f5fa163 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -621,7 +621,6 @@ MY_DEFS := \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \