summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-03-15 10:33:48 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-03-15 10:33:48 +0000
commit95d8906678b8bccd435678291a97ff37f749b203 (patch)
treea23415e77ff5f8fd9fc025d146a429ecdfaeae88
parentffa2aa821fb29d904f363681d11cfb832996dc19 (diff)
downloadfreetype-95d8906678b8bccd435678291a97ff37f749b203.tar.gz
Update makefiles after merge of Chromium at r188317
This commit was generated by merge_from_chromium.py. Change-Id: I4a105e3825009a5f7ad049d734b3db5b041f5dea
-rw-r--r--ft2.target.darwin-arm.mk6
-rw-r--r--ft2.target.linux-arm.mk6
2 files changed, 0 insertions, 12 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 95df827..014e9f6 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -56,15 +56,9 @@ MY_CFLAGS := \
-pipe \
-fPIC \
-Wno-format \
- -mthumb \
- -march=armv7-a \
- -mtune=cortex-a8 \
- -mfloat-abi=softfp \
- -mfpu=vfpv3-d16 \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
- -mthumb-interwork \
-ffunction-sections \
-funwind-tables \
-g \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 95df827..014e9f6 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -56,15 +56,9 @@ MY_CFLAGS := \
-pipe \
-fPIC \
-Wno-format \
- -mthumb \
- -march=armv7-a \
- -mtune=cortex-a8 \
- -mfloat-abi=softfp \
- -mfpu=vfpv3-d16 \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
- -mthumb-interwork \
-ffunction-sections \
-funwind-tables \
-g \