Cleanup after merging translator_lib into translator

Rename a few references to translator_lib BUG=angleproject:1596 Change-Id: Ib715fdd8a949dc46a5ef628ea2d7f71b1b771845 Reviewed-on: https://chromium-review.googlesource.com/410287Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Cleanup after merging translator_lib into translator
dfd7fb2a · Yuly Novikov · Commit Bot · 6898b358 · dfd7fb2a · dfd7fb2a
Commit dfd7fb2a authored Nov 11, 2016 by Yuly Novikov Committed by Commit Bot Nov 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

BUILD.gn BUILD.gn +4 -4

compiler.gypi src/compiler.gypi +8 -8

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -163,24 +163,24 @@ static_library("angle_image_util") {
 }

 static_library("translator") {
-  sources = rebase_path(compiler_gypi.angle_translator_lib_sources, ".", "src")
+  sources = rebase_path(compiler_gypi.angle_translator_sources, ".", "src")
  defines = []

  if (angle_enable_essl || use_libfuzzer) {
    sources +=
-        rebase_path(compiler_gypi.angle_translator_lib_essl_sources, ".", "src")
+        rebase_path(compiler_gypi.angle_translator_essl_sources, ".", "src")
    defines += [ "ANGLE_ENABLE_ESSL" ]
  }

  if (angle_enable_glsl || use_libfuzzer) {
    sources +=
-        rebase_path(compiler_gypi.angle_translator_lib_glsl_sources, ".", "src")
+        rebase_path(compiler_gypi.angle_translator_glsl_sources, ".", "src")
    defines += [ "ANGLE_ENABLE_GLSL" ]
  }

  if (angle_enable_hlsl || use_libfuzzer) {
    sources +=
-        rebase_path(compiler_gypi.angle_translator_lib_hlsl_sources, ".", "src")
+        rebase_path(compiler_gypi.angle_translator_hlsl_sources, ".", "src")
    defines += [ "ANGLE_ENABLE_HLSL" ]
  }
  configs -= angle_undefine_configs

--- a/src/compiler.gypi
+++ b/src/compiler.gypi
@@ -6,7 +6,7 @@
    'variables':
    {
        # These file lists are shared with the GN build.
-        'angle_translator_lib_sources':
+        'angle_translator_sources':
        [
            '../include/EGL/egl.h',
            '../include/EGL/eglext.h',
@@ -145,14 +145,14 @@
            'third_party/compiler/ArrayBoundsClamper.cpp',
            'third_party/compiler/ArrayBoundsClamper.h',
        ],
-        'angle_translator_lib_essl_sources':
+        'angle_translator_essl_sources':
        [
            'compiler/translator/OutputESSL.cpp',
            'compiler/translator/OutputESSL.h',
            'compiler/translator/TranslatorESSL.cpp',
            'compiler/translator/TranslatorESSL.h',
        ],
-        'angle_translator_lib_glsl_sources':
+        'angle_translator_glsl_sources':
        [
            'compiler/translator/BuiltInFunctionEmulatorGLSL.cpp',
            'compiler/translator/BuiltInFunctionEmulatorGLSL.h',
@@ -167,7 +167,7 @@
            'compiler/translator/VersionGLSL.cpp',
            'compiler/translator/VersionGLSL.h',
        ],
-        'angle_translator_lib_hlsl_sources':
+        'angle_translator_hlsl_sources':
        [
            'compiler/translator/AddDefaultReturnStatements.cpp',
            'compiler/translator/AddDefaultReturnStatements.h',
@@ -265,7 +265,7 @@
            ],
            'sources':
            [
-                '<@(angle_translator_lib_sources)',
+                '<@(angle_translator_sources)',
            ],
            'msvs_settings':
            {
@@ -291,7 +291,7 @@
                    },
                    'sources':
                    [
-                        '<@(angle_translator_lib_essl_sources)',
+                        '<@(angle_translator_essl_sources)',
                    ],
                }],
                ['angle_enable_glsl==1',
@@ -309,7 +309,7 @@
                    },
                    'sources':
                    [
-                        '<@(angle_translator_lib_glsl_sources)',
+                        '<@(angle_translator_glsl_sources)',
                    ],
                }],
                ['angle_enable_hlsl==1',
@@ -327,7 +327,7 @@
                    },
                    'sources':
                    [
-                        '<@(angle_translator_lib_hlsl_sources)',
+                        '<@(angle_translator_hlsl_sources)',
                    ],
                }],
            ],