summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-11-14 05:49:30 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-11-14 05:49:30 +0000
commit4d649e1858de9e207aa94238267a74f28bc773b1 (patch)
tree3d49c6175dd94f59148fcf490de49ac7ab1cb153
parentd48d5dea1e6a887a783d6796a32ee9b8dcadd318 (diff)
downloadfreetype-4d649e1858de9e207aa94238267a74f28bc773b1.tar.gz
Update makefiles after merge of Chromium at 235046
This commit was generated by merge_from_chromium.py. Change-Id: I2933c4da8c9a15aaec3f525595f8af3d7280bed6
-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 \