aboutsummaryrefslogtreecommitdiff
path: root/icuuc.host.darwin-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-10-13 23:15:48 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-10-13 23:15:48 +0000
commite6f1a85ad20546c7051e45b5cbfbd1467778f4ef (patch)
tree1bc713e6b98d65c5d67f89384811f923e14bc606 /icuuc.host.darwin-x86.mk
parentfff1640760da910d7401f4fa12a8d4cd9e660b61 (diff)
downloadicu-e6f1a85ad20546c7051e45b5cbfbd1467778f4ef.tar.gz
Update makefiles after merge of Chromium at 0ad654fa43a6
This commit was generated by merge_from_chromium.py. Change-Id: I409e6a5eb7a576a1feeaf813fe37e4422d74fb91
Diffstat (limited to 'icuuc.host.darwin-x86.mk')
-rw-r--r--icuuc.host.darwin-x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index d9999ec..f94aecd 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -234,6 +234,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DHAVE_DLOPEN=0' \
+ '-DUCONFIG_NO_NON_HTML5_CONVERSION=1' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -317,6 +318,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DU_USING_ICU_NAMESPACE=0' \
'-DHAVE_DLOPEN=0' \
+ '-DUCONFIG_NO_NON_HTML5_CONVERSION=1' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \