From ffad59c64eb71ce6e2ca96756503512fd7db87d1 Mon Sep 17 00:00:00 2001
From: Android Chromium Automerger <chromium-automerger@android>
Date: Mon, 17 Mar 2014 13:59:03 +0000
Subject: Update makefiles after merge of Chromium at 257420

This commit was generated by merge_from_chromium.py.

Change-Id: Ie15e16eff31b7ac58649398c2823949eeb40dd2d
---
 ft2.target.linux-x86.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ft2.target.linux-x86.mk')

diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index c4a2e76..4b78c36 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.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
 
 
-- 
cgit v1.2.3