summaryrefslogtreecommitdiff
path: root/ft2.target.linux-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-01-15 12:17:35 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-01-15 12:17:35 +0000
commit89f8b2711b317ccf82f770d76eb56eee57ad9e7a (patch)
tree65f8824d1c83be795d62ba1b2ddfb19200fbf914 /ft2.target.linux-mips.mk
parentec5a0335e49e1524ed8fddb699a55dc6c9ce9250 (diff)
downloadfreetype-89f8b2711b317ccf82f770d76eb56eee57ad9e7a.tar.gz
Update makefiles after merge of Chromium at 244866
This commit was generated by merge_from_chromium.py. Change-Id: Id89a420be48add92d674dcb271f90744335747b4
Diffstat (limited to 'ft2.target.linux-mips.mk')
-rw-r--r--ft2.target.linux-mips.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 3d25dc4..fda680a 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -56,7 +56,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -funwind-tables \
-Wno-format \
-EL \
-mhard-float \
@@ -79,7 +78,8 @@ MY_CFLAGS_Debug := \
-g \
-fomit-frame-pointer \
-fdata-sections \
- -ffunction-sections
+ -ffunction-sections \
+ -funwind-tables
MY_DEFS_Debug := \
'-DV8_DEPRECATION_WARNINGS' \
@@ -131,7 +131,6 @@ LOCAL_CPPFLAGS_Debug := \
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-uninitialized \
- -Wno-error=c++0x-compat \
-Wno-non-virtual-dtor \
-Wno-sign-promo \
-Wno-non-virtual-dtor
@@ -149,7 +148,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -funwind-tables \
-Wno-format \
-EL \
-mhard-float \
@@ -172,7 +170,8 @@ MY_CFLAGS_Release := \
-fno-ident \
-fdata-sections \
-ffunction-sections \
- -fomit-frame-pointer
+ -fomit-frame-pointer \
+ -funwind-tables
MY_DEFS_Release := \
'-DV8_DEPRECATION_WARNINGS' \
@@ -224,7 +223,6 @@ LOCAL_CPPFLAGS_Release := \
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-uninitialized \
- -Wno-error=c++0x-compat \
-Wno-non-virtual-dtor \
-Wno-sign-promo \
-Wno-non-virtual-dtor