summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-06-20 02:30:27 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-06-20 02:30:27 +0000
commite8c96ca5969a35d8ee4ab09f451aef01f72357bf (patch)
treee731bc5e230c5eec8acca5b817aae0b83a0d9b59
parent465c9389cd7f21adc1b8c7af740cafd57eadd8c0 (diff)
downloadfreetype-e8c96ca5969a35d8ee4ab09f451aef01f72357bf.tar.gz
Update makefiles after merge of Chromium at r207276
This commit was generated by merge_from_chromium.py. Change-Id: I085fe04b7177680d3cb1955ac64f7386056d061f
-rw-r--r--ft2.target.darwin-arm.mk1
-rw-r--r--ft2.target.darwin-mips.mk1
-rw-r--r--ft2.target.darwin-x86.mk1
-rw-r--r--ft2.target.linux-arm.mk1
-rw-r--r--ft2.target.linux-mips.mk1
-rw-r--r--ft2.target.linux-x86.mk1
6 files changed, 0 insertions, 6 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 51d39f1..55cf8c2 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -83,7 +83,6 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
- '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 324b649..58c002f 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -86,7 +86,6 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
- '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 79d3c56..d4bafd1 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -85,7 +85,6 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
- '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 51d39f1..55cf8c2 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -83,7 +83,6 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
- '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 324b649..58c002f 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -86,7 +86,6 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
- '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 79d3c56..d4bafd1 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -85,7 +85,6 @@ MY_CFLAGS := \
MY_CFLAGS_C :=
MY_DEFS := \
- '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \