commit 4f74071266a76d506e1d14afc3d0e5521837b31b
author Android Chromium Automerger <chromium-automerger@android> Mon Mar 11 14:10:24 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Mon Mar 11 14:10:24 2013 +0000
tree 509999d502ce7eefbf26a981593d9a32653fa258
parent f4e83553ed90afe28464ff6197d17afb58112355

Update makefiles after merge of Chromium at r187292

This commit was generated by merge_from_chromium.py.

Change-Id: I4ba24fe24a8d295275b47f8e7b77c9218ff58b58

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index f6e5c60..636e826 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -87,8 +87,6 @@
 	-Wno-extra \
 	-Wno-ignored-qualifiers \
 	-Wno-type-limits \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
 	-Os \
 	-g \
 	-fomit-frame-pointer \
@@ -141,7 +139,9 @@
 	-fvisibility-inlines-hidden \
 	-Wsign-compare \
 	-Wno-abi \
-	-Wno-error=c++0x-compat
+	-Wno-error=c++0x-compat \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo
 
 ### Rules for final target.