summaryrefslogtreecommitdiff
path: root/ft2.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-01-28 06:09:56 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-01-28 06:09:56 +0000
commit62fc6c3771b184b87d645b970ba70c9691dd162c (patch)
tree2869d8582a38c2dfa12828e238b756ef9ad613fe /ft2.target.linux-x86.mk
parentb30ef41b3a3752b14e9554e0b5050bb156e75648 (diff)
downloadfreetype-62fc6c3771b184b87d645b970ba70c9691dd162c.tar.gz
Update makefiles after merge of Chromium at 247409
This commit was generated by merge_from_chromium.py. Change-Id: I610181727540cf4c6c74943178da6a0e55954d33
Diffstat (limited to 'ft2.target.linux-x86.mk')
-rw-r--r--ft2.target.linux-x86.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 073c551..20aedd9 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -94,7 +94,6 @@ MY_DEFS_Debug := \
'-DENABLE_CONFIGURATION_POLICY' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
@@ -187,7 +186,6 @@ MY_DEFS_Release := \
'-DENABLE_CONFIGURATION_POLICY' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \