summaryrefslogtreecommitdiff
path: root/ft2.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-11-07 17:11:32 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-11-07 17:11:32 +0000
commit9cfd065c99f823a09a0902887350d9865a4ba4ac (patch)
tree3d49c6175dd94f59148fcf490de49ac7ab1cb153 /ft2.target.linux-x86.mk
parent4edb5d8a95be012d24ec24b35d09ada250e9f936 (diff)
downloadfreetype-9cfd065c99f823a09a0902887350d9865a4ba4ac.tar.gz
Update makefiles after merge of Chromium at 233627
This commit was generated by merge_from_chromium.py. Change-Id: I6b67294e5f5afe68fb5ba8e71687913ffa472728
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 a000f27..590bf5c 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -84,7 +84,6 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -172,7 +171,6 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DANGLE_DX11' \
- '-DWebKit=blink' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \