summaryrefslogtreecommitdiff
path: root/ft2.target.darwin-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-09-15 00:55:29 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-09-15 00:55:29 +0000
commit7ec9acee1ccae570cf4df7a48f6fd5a9878ebe75 (patch)
tree9ce88b38b0f201e47b351ff5fe43e363d2ee270c /ft2.target.darwin-arm.mk
parent1bf9e78af6482bd85c0a77b253a74c19253e7fbd (diff)
downloadfreetype-7ec9acee1ccae570cf4df7a48f6fd5a9878ebe75.tar.gz
Update makefiles after merge of Chromium at 223269
This commit was generated by merge_from_chromium.py. Change-Id: Ifcdc7e1cc776f47edb2286dc816450e2d2179942
Diffstat (limited to 'ft2.target.darwin-arm.mk')
-rw-r--r--ft2.target.darwin-arm.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 9788cef..c4da0f7 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -90,7 +90,6 @@ MY_DEFS_Debug := \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -177,7 +176,6 @@ MY_DEFS_Release := \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \