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