summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-11-08 13:43:47 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-11-08 13:43:47 +0000
commit8c7a79920399c35a18fb2ac4cfcc0f3e63f5f4ba (patch)
tree3d49c6175dd94f59148fcf490de49ac7ab1cb153
parent6640bc686069a91a26b475140bf6cfb3884171a2 (diff)
downloadfreetype-8c7a79920399c35a18fb2ac4cfcc0f3e63f5f4ba.tar.gz
Update makefiles after merge of Chromium at 233893
This commit was generated by merge_from_chromium.py. Change-Id: Iff8528f577d3d606b5deebcf483c6455ca7e890f
-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 83ad9f4..2b11ca5 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -55,7 +55,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-fno-tree-sra \
-fuse-ld=gold \
@@ -140,7 +139,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-fno-tree-sra \
-fuse-ld=gold \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index fe45291..d15a0c1 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -56,7 +56,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-EL \
-mhard-float \
@@ -141,7 +140,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-EL \
-mhard-float \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 784577c..590bf5c 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -54,7 +54,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-m32 \
-mmmx \
@@ -140,7 +139,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-m32 \
-mmmx \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 83ad9f4..2b11ca5 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -55,7 +55,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-fno-tree-sra \
-fuse-ld=gold \
@@ -140,7 +139,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-fno-tree-sra \
-fuse-ld=gold \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index fe45291..d15a0c1 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -56,7 +56,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-EL \
-mhard-float \
@@ -141,7 +140,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-EL \
-mhard-float \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 784577c..590bf5c 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -54,7 +54,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-m32 \
-mmmx \
@@ -140,7 +139,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-Wno-format \
-m32 \
-mmmx \