diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
| commit | a3f7b4e666c476898878fa745f637129375cd889 (patch) | |
| tree | 1d78b48780e4c8603c226fd88d8f4b786f00bb81 /sdch | |
| parent | d4336a7d5c149891bede0c3201c8e831520067af (diff) | |
| download | chromium_org-a3f7b4e666c476898878fa745f637129375cd889.tar.gz | |
Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
Diffstat (limited to 'sdch')
| -rw-r--r-- | sdch/sdch.target.darwin-arm.mk | 4 | ||||
| -rw-r--r-- | sdch/sdch.target.darwin-mips.mk | 4 | ||||
| -rw-r--r-- | sdch/sdch.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | sdch/sdch.target.linux-arm.mk | 4 | ||||
| -rw-r--r-- | sdch/sdch.target.linux-mips.mk | 4 | ||||
| -rw-r--r-- | sdch/sdch.target.linux-x86.mk | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/sdch/sdch.target.darwin-arm.mk b/sdch/sdch.target.darwin-arm.mk index b685fddcf8..48160bcef0 100644 --- a/sdch/sdch.target.darwin-arm.mk +++ b/sdch/sdch.target.darwin-arm.mk @@ -79,10 +79,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -160,10 +160,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/sdch/sdch.target.darwin-mips.mk b/sdch/sdch.target.darwin-mips.mk index f7c2e9c08c..80ea2c1694 100644 --- a/sdch/sdch.target.darwin-mips.mk +++ b/sdch/sdch.target.darwin-mips.mk @@ -78,10 +78,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -158,10 +158,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/sdch/sdch.target.darwin-x86.mk b/sdch/sdch.target.darwin-x86.mk index c32fa7b18a..b5d723518a 100644 --- a/sdch/sdch.target.darwin-x86.mk +++ b/sdch/sdch.target.darwin-x86.mk @@ -81,10 +81,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -165,10 +165,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/sdch/sdch.target.linux-arm.mk b/sdch/sdch.target.linux-arm.mk index b685fddcf8..48160bcef0 100644 --- a/sdch/sdch.target.linux-arm.mk +++ b/sdch/sdch.target.linux-arm.mk @@ -79,10 +79,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -160,10 +160,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/sdch/sdch.target.linux-mips.mk b/sdch/sdch.target.linux-mips.mk index f7c2e9c08c..80ea2c1694 100644 --- a/sdch/sdch.target.linux-mips.mk +++ b/sdch/sdch.target.linux-mips.mk @@ -78,10 +78,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -158,10 +158,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/sdch/sdch.target.linux-x86.mk b/sdch/sdch.target.linux-x86.mk index c32fa7b18a..b5d723518a 100644 --- a/sdch/sdch.target.linux-x86.mk +++ b/sdch/sdch.target.linux-x86.mk @@ -81,10 +81,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -165,10 +165,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' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ |