commit 069599dee47bb3709d9cacab9daf1013605e7f89
author Android Chromium Automerger <chromium-automerger@android> Mon Sep 02 23:27:25 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Mon Sep 02 23:27:25 2013 +0000
tree 179f62a6e37b9a58fda268be33554d1aa01a4aa9
parent 622f92857ec31f20b61a69c3287c4602d8dda768

Update makefiles after merge of Chromium at r220875

This commit was generated by merge_from_chromium.py.

Change-Id: Id7cc3d2a1d09217606d3493b98441eca765d250b

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index ec126ab..d95a05d 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -237,7 +237,9 @@
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
 	-Wl,--icf=safe \
+	-Wl,--fatal-warnings \
 	-Wl,--gc-sections \
+	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
 
@@ -256,7 +258,9 @@
 	-Wl,--icf=safe \
 	-Wl,-O1 \
 	-Wl,--as-needed \
-	-Wl,--gc-sections
+	-Wl,--gc-sections \
+	-Wl,--fatal-warnings \
+	-Wl,--warn-shared-textrel
 
 
 LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))