summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-08-27 15:43:28 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-08-27 15:43:28 +0000
commit8e763c8ed4a6df53f257c4da056b8cdeeaa57793 (patch)
treef783f8b1439a8a72475c3e773cbba52ff21d5510
parentd3eeca65d1695415008aa2ba037ac9374be833c3 (diff)
downloadfreetype-8e763c8ed4a6df53f257c4da056b8cdeeaa57793.tar.gz
Update makefiles after merge of Chromium at b241671f0248
This commit was generated by merge_from_chromium.py. Change-Id: I3a473c074834132b47e4ddb192082e73966a6f8c
-rw-r--r--ft2.target.darwin-mips.mk6
-rw-r--r--ft2.target.linux-mips.mk6
2 files changed, 0 insertions, 12 deletions
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 887212f..123c2a3 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -59,8 +59,6 @@ MY_CFLAGS_Debug := \
-fPIC \
-Wno-unused-local-typedefs \
-Wno-format \
- -EL \
- -mhard-float \
-ffunction-sections \
-funwind-tables \
-g \
@@ -165,8 +163,6 @@ MY_CFLAGS_Release := \
-fPIC \
-Wno-unused-local-typedefs \
-Wno-format \
- -EL \
- -mhard-float \
-ffunction-sections \
-funwind-tables \
-g \
@@ -269,7 +265,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
- -EL \
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
@@ -285,7 +280,6 @@ LOCAL_LDFLAGS_Release := \
-Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
- -EL \
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 887212f..123c2a3 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -59,8 +59,6 @@ MY_CFLAGS_Debug := \
-fPIC \
-Wno-unused-local-typedefs \
-Wno-format \
- -EL \
- -mhard-float \
-ffunction-sections \
-funwind-tables \
-g \
@@ -165,8 +163,6 @@ MY_CFLAGS_Release := \
-fPIC \
-Wno-unused-local-typedefs \
-Wno-format \
- -EL \
- -mhard-float \
-ffunction-sections \
-funwind-tables \
-g \
@@ -269,7 +265,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
- -EL \
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
@@ -285,7 +280,6 @@ LOCAL_LDFLAGS_Release := \
-Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
- -EL \
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \