diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-24 10:37:05 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-24 10:37:05 +0100 |
| commit | 52fa7d63c4d816edca8f685959f3586ea790d8c1 (patch) | |
| tree | 792aeeaf654daf5a8a75bd568d69b1feb6f88746 | |
| parent | f7e10dc29d76f44e94a97bc1e4a82ed15cbbd999 (diff) | |
| parent | 5644ba16f88b944aff49f5a47f013126a34ac574 (diff) | |
| download | angle_dx11-52fa7d63c4d816edca8f685959f3586ea790d8c1.tar.gz | |
Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I8fa10748f358dba026c052d6269c4fe25dbcb158
| -rw-r--r-- | src/preprocessor.target.darwin-arm.mk | 4 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-mips.mk | 4 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-arm.mk | 4 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-mips.mk | 4 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-x86.mk | 4 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-arm.mk | 4 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-mips.mk | 4 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | src/translator_common.target.linux-arm.mk | 4 | ||||
| -rw-r--r-- | src/translator_common.target.linux-mips.mk | 4 | ||||
| -rw-r--r-- | src/translator_common.target.linux-x86.mk | 4 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-arm.mk | 4 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-mips.mk | 4 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-arm.mk | 4 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-mips.mk | 4 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-x86.mk | 4 |
18 files changed, 36 insertions, 36 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk index 2ceefa6b..0061c8fa 100644 --- a/src/preprocessor.target.darwin-arm.mk +++ b/src/preprocessor.target.darwin-arm.mk @@ -84,10 +84,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -167,10 +167,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk index a2bbafa6..5f2add31 100644 --- a/src/preprocessor.target.darwin-mips.mk +++ b/src/preprocessor.target.darwin-mips.mk @@ -84,10 +84,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -167,10 +167,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk index 817c4b8e..ad6ba784 100644 --- a/src/preprocessor.target.darwin-x86.mk +++ b/src/preprocessor.target.darwin-x86.mk @@ -86,10 +86,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -172,10 +172,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk index 2ceefa6b..0061c8fa 100644 --- a/src/preprocessor.target.linux-arm.mk +++ b/src/preprocessor.target.linux-arm.mk @@ -84,10 +84,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -167,10 +167,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk index a2bbafa6..5f2add31 100644 --- a/src/preprocessor.target.linux-mips.mk +++ b/src/preprocessor.target.linux-mips.mk @@ -84,10 +84,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -167,10 +167,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk index 817c4b8e..ad6ba784 100644 --- a/src/preprocessor.target.linux-x86.mk +++ b/src/preprocessor.target.linux-x86.mk @@ -86,10 +86,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -172,10 +172,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' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/src/translator_common.target.darwin-arm.mk b/src/translator_common.target.darwin-arm.mk index fd456e78..9d0fdfda 100644 --- a/src/translator_common.target.darwin-arm.mk +++ b/src/translator_common.target.darwin-arm.mk @@ -109,10 +109,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -195,10 +195,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_common.target.darwin-mips.mk b/src/translator_common.target.darwin-mips.mk index ed51273e..492a7eca 100644 --- a/src/translator_common.target.darwin-mips.mk +++ b/src/translator_common.target.darwin-mips.mk @@ -109,10 +109,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -195,10 +195,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_common.target.darwin-x86.mk b/src/translator_common.target.darwin-x86.mk index 011ea14b..fb6c41f3 100644 --- a/src/translator_common.target.darwin-x86.mk +++ b/src/translator_common.target.darwin-x86.mk @@ -111,10 +111,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -200,10 +200,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk index fd456e78..9d0fdfda 100644 --- a/src/translator_common.target.linux-arm.mk +++ b/src/translator_common.target.linux-arm.mk @@ -109,10 +109,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -195,10 +195,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_common.target.linux-mips.mk b/src/translator_common.target.linux-mips.mk index ed51273e..492a7eca 100644 --- a/src/translator_common.target.linux-mips.mk +++ b/src/translator_common.target.linux-mips.mk @@ -109,10 +109,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -195,10 +195,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk index 011ea14b..fb6c41f3 100644 --- a/src/translator_common.target.linux-x86.mk +++ b/src/translator_common.target.linux-x86.mk @@ -111,10 +111,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -200,10 +200,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk index 381b4b6e..f1ffa64e 100644 --- a/src/translator_glsl.target.darwin-arm.mk +++ b/src/translator_glsl.target.darwin-arm.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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -167,10 +167,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_glsl.target.darwin-mips.mk b/src/translator_glsl.target.darwin-mips.mk index 7686d3f1..cf14bf17 100644 --- a/src/translator_glsl.target.darwin-mips.mk +++ b/src/translator_glsl.target.darwin-mips.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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -167,10 +167,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk index dde950f5..fe2edd0f 100644 --- a/src/translator_glsl.target.darwin-x86.mk +++ b/src/translator_glsl.target.darwin-x86.mk @@ -83,10 +83,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -172,10 +172,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk index 381b4b6e..f1ffa64e 100644 --- a/src/translator_glsl.target.linux-arm.mk +++ b/src/translator_glsl.target.linux-arm.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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -167,10 +167,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_glsl.target.linux-mips.mk b/src/translator_glsl.target.linux-mips.mk index 7686d3f1..cf14bf17 100644 --- a/src/translator_glsl.target.linux-mips.mk +++ b/src/translator_glsl.target.linux-mips.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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -167,10 +167,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk index dde950f5..fe2edd0f 100644 --- a/src/translator_glsl.target.linux-x86.mk +++ b/src/translator_glsl.target.linux-x86.mk @@ -83,10 +83,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -172,10 +172,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' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ |