commit 91a1f1776bffce5e1167847f942c13423f49a1ee
author Android Chromium Automerger <chromium-automerger@android> Wed Jul 24 00:49:16 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Wed Jul 24 00:49:16 2013 +0000
tree b060999643202cc523b598f0321afbe0aeefd963
parent d1de5234d0bd9fbe7a1a25c23c4cb3458ca19d86

Update makefiles after merge of Chromium at r213294

This commit was generated by merge_from_chromium.py.

Change-Id: I622db8786949e6016bfe1a1f42df58d10474047e

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 7100a87..ba94007 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -98,6 +98,7 @@
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -180,6 +181,7 @@
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \