From 8c14a93fb15049305837987066b945ccaab14dd1 Mon Sep 17 00:00:00 2001
From: Android Chromium Automerger <chromium-automerger@android>
Date: Wed, 12 Feb 2014 16:14:52 +0000
Subject: Update makefiles after merge of Chromium at 250727

This commit was generated by merge_from_chromium.py.

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

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

diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 20aedd9..7499368 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -71,6 +71,7 @@ MY_CFLAGS_Debug := \
 	-Wno-extra \
 	-Wno-ignored-qualifiers \
 	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
 	-fno-stack-protector \
 	-Wno-address \
 	-Wno-format-security \
@@ -163,6 +164,7 @@ MY_CFLAGS_Release := \
 	-Wno-extra \
 	-Wno-ignored-qualifiers \
 	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
 	-fno-stack-protector \
 	-Wno-address \
 	-Wno-format-security \
-- 
cgit v1.2.3