commit 7c8f5677fa932520ffbf577f10de7b18fab181ed
author Android Chromium Automerger <chromium-automerger@android> Thu Dec 05 17:58:42 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Thu Dec 05 17:58:42 2013 +0000
tree 74ff92730d2bb08ea53c6583f5a3f7504731dc34
parent 15ebc0b493294e66ccece24ad4f29e976d57b6ae

Update makefiles after merge of Chromium at 238989

This commit was generated by merge_from_chromium.py.

Change-Id: I627b9c244d0357935e23ae6e8b8f24a84b01a973

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index deda135..58e4ce2 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -90,10 +90,10 @@
 
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
+	'-DV8_DEPRECATION_WARNINGS' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
-	'-DV8_DEPRECATION_WARNINGS' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
@@ -176,10 +176,10 @@
 
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
+	'-DV8_DEPRECATION_WARNINGS' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
 	'-DDISABLE_NACL' \
-	'-DV8_DEPRECATION_WARNINGS' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \