From 3e5cd3dcfcb3ae180b836003cd160d753f46c39e Mon Sep 17 00:00:00 2001
From: "zmo@chromium.org"
 <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 4 Oct 2013 00:02:22 +0000
Subject: Use translator instead of translator_glsl ANGLE dependency.

At the moment legacy translator_glsl is simply a duplication of translator.

BUG=
TEST=tree

Review URL: https://codereview.chromium.org/25351004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226903 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/common.gypi                |  5 +++++
 gpu/command_buffer_service.gypi  | 10 +++++++++-
 gpu/gpu.gyp                      | 20 ++++++++++++++++++--
 webkit/common/gpu/webkit_gpu.gyp | 12 +++++++++++-
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/build/common.gypi b/build/common.gypi
index f9d2ca0..14c2996 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -250,6 +250,10 @@
       # use_libjpeg_turbo is set.
       'use_system_libjpeg%': 0,
 
+      # Use ANGLE target translator instead of translator_glsl.
+      # TODO(zmo): clean this up when both chromium and webkit switch over.
+      'use_angle_translator%': 0,
+
       # By default, component is set to static_library and it can be overriden
       # by the GYP command line or by ~/.gyp/include.gypi.
       'component%': 'static_library',
@@ -879,6 +883,7 @@
     'wix_path%': '<(wix_path)',
     'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
     'use_system_libjpeg%': '<(use_system_libjpeg)',
+    'use_angle_translator%': '<(use_angle_translator)',
     'android_webview_build%': '<(android_webview_build)',
     'gyp_managed_install%': 0,
     'create_standalone_apk%': 1,
diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi
index 5a7f6fb..e541999 100644
--- a/gpu/command_buffer_service.gypi
+++ b/gpu/command_buffer_service.gypi
@@ -18,7 +18,6 @@
     '../ui/gfx/gfx.gyp:gfx',
     '../ui/gl/gl.gyp:gl',
     '../ui/ui.gyp:ui',
-    '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
     '../third_party/khronos/khronos.gyp:khronos_headers',
     '../third_party/protobuf/protobuf.gyp:protobuf_lite',
     '../third_party/smhasher/smhasher.gyp:cityhash',
@@ -141,6 +140,15 @@
         '../third_party/khronos',
       ],
     }],
+    ['use_angle_translator==1', {
+      'dependencies': [
+        '../third_party/angle_dx11/src/build_angle.gyp:translator',
+      ],
+    }, {
+      'dependencies': [
+        '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
+      ],
+    }],
     ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', {
       'sources': [
         'command_buffer/service/async_pixel_transfer_manager_egl.cc',
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 51122cd..8fef21d 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -126,7 +126,6 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
         '../ui/gl/gl.gyp:gl',
         '../ui/gfx/gfx.gyp:gfx',
         'command_buffer/command_buffer.gyp:gles2_utils',
@@ -241,6 +240,15 @@
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
+        ['use_angle_translator==1', {
+          'dependencies': [
+            '../third_party/angle_dx11/src/build_angle.gyp:translator',
+          ],
+        }, {
+          'dependencies': [
+            '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
+          ],
+        }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
@@ -253,7 +261,6 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
         '../ui/gfx/gfx.gyp:gfx',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'command_buffer_client',
@@ -302,6 +309,15 @@
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
+        ['use_angle_translator==1', {
+          'dependencies': [
+            '../third_party/angle_dx11/src/build_angle.gyp:translator',
+          ],
+        }, {
+          'dependencies': [
+            '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
+          ],
+        }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp
index 460d486..d85e478 100644
--- a/webkit/common/gpu/webkit_gpu.gyp
+++ b/webkit/common/gpu/webkit_gpu.gyp
@@ -23,7 +23,6 @@
             '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
             '<(DEPTH)/skia/skia.gyp:skia',
             '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
-            '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
             '<(DEPTH)/ui/gl/gl.gyp:gl',
             '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
             '<(DEPTH)/ui/ui.gyp:ui',
@@ -48,6 +47,17 @@
           'defines': [
             'WEBKIT_GPU_IMPLEMENTATION',
           ],
+          'conditions': [
+            ['use_angle_translator==1', {
+              'dependencies': [
+                '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
+              ],
+            }, {
+              'dependencies': [
+                '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
+              ],
+            }],
+          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
-- 
cgit v1.1