summaryrefslogtreecommitdiff
path: root/ft2.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-07-29 12:35:29 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-07-29 12:35:29 +0000
commit27c6b11e25df7772e975abfac1024d09822e8b9d (patch)
tree27e5266925aed2a650ff46470cdfdaddac9edc68 /ft2.target.linux-x86.mk
parentd0d975b7c290905153a6c5e7e0c2cb9516627e04 (diff)
downloadfreetype-27c6b11e25df7772e975abfac1024d09822e8b9d.tar.gz
Update makefiles after merge of Chromium at 286177
This commit was generated by merge_from_chromium.py. Change-Id: I491cf3dbc684be9439bc004a44272160f8848527
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 3368bc5..39081f9 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -100,7 +100,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -207,7 +206,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \