summaryrefslogtreecommitdiff
path: root/ft2.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-07 11:32:27 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-07 11:32:27 +0000
commit4222ef4684afde38d583e2a7881a547ac4ccfa37 (patch)
tree610715edfac54f6dd61865fe08509cdf78a2cc3d /ft2.target.linux-x86.mk
parent11fb23970fef92ab630f6471a15fd961b66f2e48 (diff)
downloadfreetype-4222ef4684afde38d583e2a7881a547ac4ccfa37.tar.gz
Update makefiles after merge of Chromium at 255581
This commit was generated by merge_from_chromium.py. Change-Id: I65714146f884f8b82d636128a284c4805fc1dc52
Diffstat (limited to 'ft2.target.linux-x86.mk')
-rw-r--r--ft2.target.linux-x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 9bbf9e4..512514f 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -86,6 +86,7 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DV8_DEPRECATION_WARNINGS' \
+ '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -181,6 +182,7 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DV8_DEPRECATION_WARNINGS' \
+ '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \