From a3f7b4e666c476898878fa745f637129375cd889 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 24 Jul 2013 10:36:34 +0100 Subject: Merge from Chromium at DEPS revision r213371 This commit was generated by merge_to_master.py. Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf --- url/url_lib.target.darwin-arm.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'url/url_lib.target.darwin-arm.mk') diff --git a/url/url_lib.target.darwin-arm.mk b/url/url_lib.target.darwin-arm.mk index fc9985ac15..b0ae24e03b 100644 --- a/url/url_lib.target.darwin-arm.mk +++ b/url/url_lib.target.darwin-arm.mk @@ -88,10 +88,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DURL_IMPLEMENTATION' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ @@ -174,10 +174,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DURL_IMPLEMENTATION' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ -- cgit v1.2.3