commit 949d5ad6d46b1d51a2132b2e34365a6ced08dd12
author Android Chromium Automerger <chromium-automerger@android> Wed Feb 12 16:14:52 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Wed Feb 12 16:14:52 2014 +0000
tree 14ce7f8e18f06b9801d66719338b18c31ff3523a
parent 1c4404944b4def3fec89771713763ae2c8ea3355

Update makefiles after merge of Chromium at 250727

This commit was generated by merge_from_chromium.py.

Change-Id: I2069aa2db6f5638d805224cf4afc6c7e2305b61a

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index ff3693a..cf34deb 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -83,6 +83,7 @@
 	-Wno-extra \
 	-Wno-ignored-qualifiers \
 	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
 	-Os \
 	-g \
 	-fomit-frame-pointer \
@@ -166,6 +167,7 @@
 	-Wno-extra \
 	-Wno-ignored-qualifiers \
 	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
 	-Os \
 	-fno-ident \
 	-fdata-sections \