summaryrefslogtreecommitdiff
path: root/ft2.target.linux-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-10-30 16:55:21 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-10-30 16:55:21 +0000
commit0d9f124115431d076c74e7ff6659e91b610387b2 (patch)
treef97ea7f2b8d6afd31542225cb30411a0aeb8ff0d /ft2.target.linux-mips.mk
parentc94635b648871ee34f2b03a38902bbc422c193a4 (diff)
downloadfreetype-0d9f124115431d076c74e7ff6659e91b610387b2.tar.gz
Update makefiles after merge of Chromium at 231849
This commit was generated by merge_from_chromium.py. Change-Id: I59c94899d127b6a20b0dfcb84f85dc699b81637f
Diffstat (limited to 'ft2.target.linux-mips.mk')
-rw-r--r--ft2.target.linux-mips.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 37dfe4d..d15a0c1 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -84,13 +84,13 @@ MY_DEFS_Debug := \
'-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
@@ -168,13 +168,13 @@ MY_DEFS_Release := \
'-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \