Remove component translator target and keep static_library.

BUILD.gn

@@ -73,16 +73,19 @@ if (is_win) {
 
 angle_undefine_configs = [ "//build/config/compiler:default_include_dirs" ]
 
-component("translator") {
+static_library("translator") {
   sources = [
     "src/compiler/translator/ShaderLang.cpp",
     "src/compiler/translator/ShaderVars.cpp",
   ]
 
-  defines = [ "ANGLE_TRANSLATOR_IMPLEMENTATION" ]
+  if (angle_enable_hlsl) {
+    defines = [ "ANGLE_ENABLE_HLSL" ]
+  }
 
   configs -= angle_undefine_configs
   configs += [ ":internal_config" ]
+  public_configs = [ ":translator_static_config" ]
 
   public_deps = [
     ":translator_lib",
@@ -229,25 +232,6 @@ static_library("translator_lib") {
   }
 }
 
-static_library("translator_static") {
-  sources = [
-    "src/compiler/translator/ShaderLang.cpp",
-    "src/compiler/translator/ShaderVars.cpp",
-  ]
-
-  if (angle_enable_hlsl) {
-    defines = [ "ANGLE_ENABLE_HLSL" ]
-  }
-
-  configs -= angle_undefine_configs
-  configs += [ ":internal_config" ]
-  public_configs = [ ":translator_static_config" ]
-
-  public_deps = [
-    ":translator_lib",
-  ]
-}
-
 source_set("translator_fuzzer") {
   sources = [
     "src/compiler/fuzz/translator_fuzzer.cpp",
@@ -259,7 +243,7 @@ source_set("translator_fuzzer") {
   ]
 
   deps = [
-    ":translator_static",
+    ":translator",
   ]
 }
 
@@ -350,7 +334,7 @@ static_library("libANGLE") {
     ":angle_image_util",
     ":commit_id",
     ":includes",
-    ":translator_static",
+    ":translator",
   ]
 
   # Shared D3D sources.

samples/samples.gyp

@@ -9,7 +9,7 @@
             'target_name': 'shader_translator',
             'type': 'executable',
             'includes': [ '../build/common_defines.gypi', ],
-            'dependencies': [ '../src/angle.gyp:translator_static', ],
+            'dependencies': [ '../src/angle.gyp:translator', ],
             'include_dirs': [ '../include', ],
             'sources': [ 'shader_translator/shader_translator.cpp' ],
         },

src/compiler.gypi

@@ -339,29 +339,8 @@
 
         {
             'target_name': 'translator',
-            'type': '<(component)',
-            'dependencies': [ 'translator_lib', 'angle_common' ],
-            'includes': [ '../build/common_defines.gypi', ],
-            'include_dirs':
-            [
-                '.',
-                '../include',
-            ],
-            'defines':
-            [
-                'ANGLE_TRANSLATOR_IMPLEMENTATION',
-            ],
-            'sources':
-            [
-                'compiler/translator/ShaderLang.cpp',
-                'compiler/translator/ShaderVars.cpp'
-            ],
-        },
-
-        {
-            'target_name': 'translator_static',
             'type': 'static_library',
-            'dependencies': [ 'translator_lib' ],
+            'dependencies': [ 'translator_lib', 'angle_common' ],
             'includes': [ '../build/common_defines.gypi', ],
             'include_dirs':
             [
@@ -384,6 +363,23 @@
                 'compiler/translator/ShaderLang.cpp',
                 'compiler/translator/ShaderVars.cpp'
             ],
+            'conditions':
+            [
+                ['angle_enable_hlsl==1',
+                {
+                    'defines':
+                    [
+                        'ANGLE_ENABLE_HLSL',
+                    ],
+                    'direct_dependent_settings':
+                    {
+                        'defines':
+                        [
+                            'ANGLE_ENABLE_HLSL',
+                        ],
+                    },
+                }],
+            ],
         },
     ],
 }

src/libGLESv2.gypi

@@ -705,7 +705,7 @@
             'type': 'static_library',
             'dependencies':
             [
-                'translator_static',
+                'translator',
                 'commit_id',
                 'angle_common',
                 'angle_image_util',

src/tests/BUILD.gn

@@ -37,7 +37,7 @@ test("angle_unittests") {
     "//testing/gtest",
     "//third_party/angle:libANGLE",
     "//third_party/angle:preprocessor",
-    "//third_party/angle:translator_static",
+    "//third_party/angle:translator",
   ]
 }
 
@@ -97,7 +97,7 @@ if (is_win || is_linux || is_mac || is_android) {
       "//third_party/angle:libEGL",
       "//third_party/angle:libGLESv2",
       "//third_party/angle:preprocessor",
-      "//third_party/angle:translator_static",
+      "//third_party/angle:translator",
     ]
   }
 }

src/tests/angle_unittests.gypi

@@ -101,7 +101,7 @@
     [
         '<(angle_path)/src/angle.gyp:libANGLE',
         '<(angle_path)/src/angle.gyp:preprocessor',
-        '<(angle_path)/src/angle.gyp:translator_static',
+        '<(angle_path)/src/angle.gyp:translator',
         '<(angle_path)/src/tests/tests.gyp:angle_test_support',
     ],
     'include_dirs':