Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
diff --git a/net/net.target.darwin-mips.mk b/net/net.target.darwin-mips.mk
index d434cd4..aa3545c 100644
--- a/net/net.target.darwin-mips.mk
+++ b/net/net.target.darwin-mips.mk
@@ -486,10 +486,10 @@
'-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' \
'-DNET_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
'-DENABLE_BUILT_IN_DNS' \
@@ -578,10 +578,10 @@
'-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' \
'-DNET_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
'-DENABLE_BUILT_IN_DNS' \