summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-12-17 10:52:04 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-12-17 10:52:04 +0000
commit539e7fdadf0f605b3441fe47654e75ff55df0b97 (patch)
tree11ce6a42cac734fe20153b4f2eec2ec01baa4d37
parent2db2f930232981cefc080c7f456a5f2e91062132 (diff)
downloadfreetype-539e7fdadf0f605b3441fe47654e75ff55df0b97.tar.gz
Update makefiles after merge of Chromium at 241250
This commit was generated by merge_from_chromium.py. Change-Id: Ic5297736ed050e19153d5b0819e69c01efc95425
-rw-r--r--ft2.target.darwin-arm.mk2
-rw-r--r--ft2.target.darwin-mips.mk2
-rw-r--r--ft2.target.darwin-x86.mk2
-rw-r--r--ft2.target.linux-arm.mk2
-rw-r--r--ft2.target.linux-mips.mk2
-rw-r--r--ft2.target.linux-x86.mk2
6 files changed, 0 insertions, 12 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index a71c134..b0a87db 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \
-ffunction-sections
MY_DEFS_Debug := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -169,7 +168,6 @@ MY_CFLAGS_Release := \
-fomit-frame-pointer
MY_DEFS_Release := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 361d1be..1cced33 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \
-ffunction-sections
MY_DEFS_Debug := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -169,7 +168,6 @@ MY_CFLAGS_Release := \
-fomit-frame-pointer
MY_DEFS_Release := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 1a01141..dadfc4d 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -83,7 +83,6 @@ MY_CFLAGS_Debug := \
-ffunction-sections
MY_DEFS_Debug := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -174,7 +173,6 @@ MY_CFLAGS_Release := \
-fno-asynchronous-unwind-tables
MY_DEFS_Release := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index a71c134..b0a87db 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \
-ffunction-sections
MY_DEFS_Debug := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -169,7 +168,6 @@ MY_CFLAGS_Release := \
-fomit-frame-pointer
MY_DEFS_Release := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 361d1be..1cced33 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \
-ffunction-sections
MY_DEFS_Debug := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -169,7 +168,6 @@ MY_CFLAGS_Release := \
-fomit-frame-pointer
MY_DEFS_Release := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 1a01141..dadfc4d 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -83,7 +83,6 @@ MY_CFLAGS_Debug := \
-ffunction-sections
MY_DEFS_Debug := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -174,7 +173,6 @@ MY_CFLAGS_Release := \
-fno-asynchronous-unwind-tables
MY_DEFS_Release := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \