diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-07-24 07:30:14 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-07-24 07:30:14 +0000 |
| commit | 5644ba16f88b944aff49f5a47f013126a34ac574 (patch) | |
| tree | 792aeeaf654daf5a8a75bd568d69b1feb6f88746 | |
| parent | 54c91b24db0c9df04690416e646d441220e5a78a (diff) | |
| download | angle_dx11-5644ba16f88b944aff49f5a47f013126a34ac574.tar.gz | |
Update makefiles after merge of Chromium at r213363
This commit was generated by merge_from_chromium.py.
Change-Id: If3e2ca42b678a86e4e8f383de48308638ca2cdb5
| -rw-r--r-- | src/preprocessor.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | src/translator_common.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | src/translator_common.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | src/translator_common.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-x86.mk | 2 |
18 files changed, 0 insertions, 36 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk index 732e2b18..0061c8fa 100644 --- a/src/preprocessor.target.darwin-arm.mk +++ b/src/preprocessor.target.darwin-arm.mk @@ -88,7 +88,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -172,7 +171,6 @@ MY_DEFS_Release := \ '-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 9e99c98a..5f2add31 100644 --- a/src/preprocessor.target.darwin-mips.mk +++ b/src/preprocessor.target.darwin-mips.mk @@ -88,7 +88,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -172,7 +171,6 @@ MY_DEFS_Release := \ '-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 d45a0de9..ad6ba784 100644 --- a/src/preprocessor.target.darwin-x86.mk +++ b/src/preprocessor.target.darwin-x86.mk @@ -90,7 +90,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -177,7 +176,6 @@ MY_DEFS_Release := \ '-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 732e2b18..0061c8fa 100644 --- a/src/preprocessor.target.linux-arm.mk +++ b/src/preprocessor.target.linux-arm.mk @@ -88,7 +88,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -172,7 +171,6 @@ MY_DEFS_Release := \ '-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 9e99c98a..5f2add31 100644 --- a/src/preprocessor.target.linux-mips.mk +++ b/src/preprocessor.target.linux-mips.mk @@ -88,7 +88,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -172,7 +171,6 @@ MY_DEFS_Release := \ '-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 d45a0de9..ad6ba784 100644 --- a/src/preprocessor.target.linux-x86.mk +++ b/src/preprocessor.target.linux-x86.mk @@ -90,7 +90,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -177,7 +176,6 @@ MY_DEFS_Release := \ '-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 1b302fdc..9d0fdfda 100644 --- a/src/translator_common.target.darwin-arm.mk +++ b/src/translator_common.target.darwin-arm.mk @@ -113,7 +113,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -200,7 +199,6 @@ MY_DEFS_Release := \ '-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 689be7b4..492a7eca 100644 --- a/src/translator_common.target.darwin-mips.mk +++ b/src/translator_common.target.darwin-mips.mk @@ -113,7 +113,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -200,7 +199,6 @@ MY_DEFS_Release := \ '-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 29062b56..fb6c41f3 100644 --- a/src/translator_common.target.darwin-x86.mk +++ b/src/translator_common.target.darwin-x86.mk @@ -115,7 +115,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -205,7 +204,6 @@ MY_DEFS_Release := \ '-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 1b302fdc..9d0fdfda 100644 --- a/src/translator_common.target.linux-arm.mk +++ b/src/translator_common.target.linux-arm.mk @@ -113,7 +113,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -200,7 +199,6 @@ MY_DEFS_Release := \ '-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 689be7b4..492a7eca 100644 --- a/src/translator_common.target.linux-mips.mk +++ b/src/translator_common.target.linux-mips.mk @@ -113,7 +113,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -200,7 +199,6 @@ MY_DEFS_Release := \ '-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 29062b56..fb6c41f3 100644 --- a/src/translator_common.target.linux-x86.mk +++ b/src/translator_common.target.linux-x86.mk @@ -115,7 +115,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -205,7 +204,6 @@ MY_DEFS_Release := \ '-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 cbf3618b..f1ffa64e 100644 --- a/src/translator_glsl.target.darwin-arm.mk +++ b/src/translator_glsl.target.darwin-arm.mk @@ -85,7 +85,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -172,7 +171,6 @@ MY_DEFS_Release := \ '-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 6b4af14e..cf14bf17 100644 --- a/src/translator_glsl.target.darwin-mips.mk +++ b/src/translator_glsl.target.darwin-mips.mk @@ -85,7 +85,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -172,7 +171,6 @@ MY_DEFS_Release := \ '-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 cf3574ae..fe2edd0f 100644 --- a/src/translator_glsl.target.darwin-x86.mk +++ b/src/translator_glsl.target.darwin-x86.mk @@ -87,7 +87,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -177,7 +176,6 @@ MY_DEFS_Release := \ '-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 cbf3618b..f1ffa64e 100644 --- a/src/translator_glsl.target.linux-arm.mk +++ b/src/translator_glsl.target.linux-arm.mk @@ -85,7 +85,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -172,7 +171,6 @@ MY_DEFS_Release := \ '-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 6b4af14e..cf14bf17 100644 --- a/src/translator_glsl.target.linux-mips.mk +++ b/src/translator_glsl.target.linux-mips.mk @@ -85,7 +85,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -172,7 +171,6 @@ MY_DEFS_Release := \ '-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 cf3574ae..fe2edd0f 100644 --- a/src/translator_glsl.target.linux-x86.mk +++ b/src/translator_glsl.target.linux-x86.mk @@ -87,7 +87,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -177,7 +176,6 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DCOMPILER_IMPLEMENTATION' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ |