summaryrefslogtreecommitdiff
path: root/ft2.target.linux-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-17 13:59:03 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-17 13:59:03 +0000
commitffad59c64eb71ce6e2ca96756503512fd7db87d1 (patch)
treeea102d99d9287ddcd3daf4ee9ceb247296284c16 /ft2.target.linux-mips.mk
parent299bdd6cce9f505dd0ee3f7e2a811b6360e71bba (diff)
downloadfreetype-ffad59c64eb71ce6e2ca96756503512fd7db87d1.tar.gz
Update makefiles after merge of Chromium at 257420
This commit was generated by merge_from_chromium.py. Change-Id: Ie15e16eff31b7ac58649398c2823949eeb40dd2d
Diffstat (limited to 'ft2.target.linux-mips.mk')
-rw-r--r--ft2.target.linux-mips.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index b1b231f..7e4ca33 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -241,6 +241,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
LOCAL_LDFLAGS_Debug := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -250,7 +251,6 @@ LOCAL_LDFLAGS_Debug := \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -258,6 +258,7 @@ LOCAL_LDFLAGS_Debug := \
LOCAL_LDFLAGS_Release := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -270,7 +271,6 @@ LOCAL_LDFLAGS_Release := \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel