Use translator instead of translator_glsl ANGLE dependency.

gpu/gpu.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'nacl_win64_target': 0,
   },
   'includes': [
     'gpu_common.gypi',
@@ skipping 108 matching lines @@
     },
     {
       'target_name': 'gpu_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../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',
         'command_buffer_client',
         'command_buffer_common',
         'command_buffer_service',
         'gpu',
         'gpu_unittest_utils',
         'gles2_implementation_client_side_arrays',
         'gles2_cmd_helper',
@@ skipping 94 matching lines @@
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         # See http://crbug.com/162998#c4 for why this is needed.
         ['OS=="linux" and linux_use_tcmalloc==1', {
           'dependencies': [
             '../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, ],
     },
     {
       'target_name': 'gl_tests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../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',
         'command_buffer_common',
         'command_buffer_service',
         'gpu',
         'gpu_unittest_utils',
         'gles2_implementation_client_side_arrays',
         'gles2_cmd_helper',
         #'gl_unittests',
@@ skipping 28 matching lines @@
         'command_buffer/tests/gl_unittests_android.cc',
         'command_buffer/tests/gl_virtual_contexts_unittests.cc',
         'command_buffer/tests/occlusion_query_unittests.cc',
       ],
       'conditions': [
         ['OS == "android" and gtest_target_type == "shared_library"', {
           'dependencies': [
             '../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, ],
     },
     {
       'target_name': 'gpu_unittest_utils',
       'type': 'static_library',
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ skipping 228 matching lines @@
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [
             '../build/apk_test.gypi',
           ],
         },
       ],
     }],
   ],
 }