Remove the use_angle_translator condition.

We retired translator_glsl already, so we always use translator.

This is a revertion of https://codereview.chromium.org/25351004/.

BUG=
TEST=tree
TBR=jamesr

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227372 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 4 insertions, 43 deletions

diff --git a/build/common.gypi b/build/common.gypi
index cdaef9b..aac4ba3 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -245,10 +245,6 @@
       # 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%': 1,
-
       # 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',
@@ -869,7 +865,6 @@
     '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 e541999..ae62938 100644
--- a/gpu/command_buffer_service.gypi
+++ b/gpu/command_buffer_service.gypi
@@ -18,6 +18,7 @@
     '../ui/gfx/gfx.gyp:gfx',
     '../ui/gl/gl.gyp:gl',
     '../ui/ui.gyp:ui',
+    '../third_party/angle_dx11/src/build_angle.gyp:translator',
     '../third_party/khronos/khronos.gyp:khronos_headers',
     '../third_party/protobuf/protobuf.gyp:protobuf_lite',
     '../third_party/smhasher/smhasher.gyp:cityhash',
@@ -140,15 +141,6 @@
         '../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 8fef21d..fd7cac8 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -126,6 +126,7 @@
         '../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',
         '../ui/gl/gl.gyp:gl',
         '../ui/gfx/gfx.gyp:gfx',
         'command_buffer/command_buffer.gyp:gles2_utils',
@@ -240,15 +241,6 @@
             '../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, ],
@@ -261,6 +253,7 @@
         '../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',
         '../ui/gfx/gfx.gyp:gfx',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'command_buffer_client',
@@ -309,15 +302,6 @@
             '../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 d85e478..86f7e43 100644
--- a/webkit/common/gpu/webkit_gpu.gyp
+++ b/webkit/common/gpu/webkit_gpu.gyp
@@ -23,6 +23,7 @@
             '<(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',
             '<(DEPTH)/ui/gl/gl.gyp:gl',
             '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
             '<(DEPTH)/ui/ui.gyp:ui',
@@ -47,17 +48,6 @@
           '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, ],
         },