roll ANGLE w/ GN update

ANGLE switched their .gypi files to .gni files this commit,
so we need to make a small tweak to update our ANGLE build.

This removes the last use of gypi_to_gn.py, and in turn gn_helpers.py.

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE


Change-Id: I76c8a667e7c5c27dc4cd18ba0d932bfc2de38cf9
Reviewed-on: https://skia-review.googlesource.com/150541
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

1 files changed, 19 insertions, 32 deletions

diff --git a/third_party/angle2/BUILD.gn b/third_party/angle2/BUILD.gn
index d36626da49..752cf0bdb6 100644
--- a/third_party/angle2/BUILD.gn
+++ b/third_party/angle2/BUILD.gn
@@ -9,6 +9,8 @@ declare_args() {
 angle_root = "../externals/angle2"
 
 import("../third_party.gni")
+import("$angle_root/src/compiler.gni")
+import("$angle_root/src/libGLESv2.gni")
 
 third_party("angle2") {
   public_include_dirs = [ "$angle_root/include" ]
@@ -18,16 +20,6 @@ third_party("angle2") {
   ]
 }
 
-compiler_gypi = exec_script("//gn/gypi_to_gn.py",
-                            [ rebase_path("$angle_root/src/compiler.gypi") ],
-                            "scope",
-                            [])
-
-gles_gypi = exec_script("//gn/gypi_to_gn.py",
-                        [ rebase_path("$angle_root/src/libGLESv2.gypi") ],
-                        "scope",
-                        [])
-
 config("common") {
   defines = [
     "ANGLE_ENABLE_ESSL",
@@ -93,14 +85,11 @@ shared_library("libGLESv2") {
   ]
   libs = []
   sources = rebase_path(
-          compiler_gypi.angle_preprocessor_sources +
-              compiler_gypi.angle_translator_sources +
-              compiler_gypi.angle_translator_essl_sources +
-              compiler_gypi.angle_translator_glsl_sources +
-              compiler_gypi.angle_translator_hlsl_sources +
-              gles_gypi.libangle_sources + gles_gypi.libangle_common_sources +
-              gles_gypi.libangle_image_util_sources +
-              gles_gypi.libglesv2_sources + gles_gypi.libangle_gl_sources,
+          angle_preprocessor_sources + angle_translator_sources +
+              angle_translator_essl_sources + angle_translator_glsl_sources +
+              angle_translator_hlsl_sources + libangle_sources +
+              libangle_common_sources + libangle_image_util_sources +
+              libglesv2_sources + libangle_gl_sources,
           ".",
           "$angle_root/src")
   if (is_win) {
@@ -112,23 +101,21 @@ shared_library("libGLESv2") {
       "Xi",
       "Xext",
     ]
-    sources += rebase_path(gles_gypi.libangle_gl_glx_sources +
-                               gles_gypi.libangle_common_linux_sources,
-                           ".",
-                           "$angle_root/src") +
-               [ "$angle_root/src/third_party/libXNVCtrl/NVCtrl.c" ]
+    sources +=
+        rebase_path(libangle_gl_glx_sources + libangle_common_linux_sources,
+                    ".",
+                    "$angle_root/src") +
+        [ "$angle_root/src/third_party/libXNVCtrl/NVCtrl.c" ]
   } else if (is_win) {
     defines += [
       # TODO: ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES
     ]
-    sources += rebase_path(gles_gypi.libangle_gl_wgl_sources +
-                               gles_gypi.libangle_d3d_shared_sources +
-                               gles_gypi.libangle_d3d9_sources +
-                               gles_gypi.libangle_d3d11_sources +
-                               gles_gypi.libangle_d3d11_win32_sources +
-                               gles_gypi.libangle_common_win_sources,
-                           ".",
-                           "$angle_root/src")
+    sources += rebase_path(
+            libangle_gl_wgl_sources + libangle_d3d_shared_sources +
+                libangle_d3d9_sources + libangle_d3d11_sources +
+                libangle_d3d11_win32_sources + libangle_common_win_sources,
+            ".",
+            "$angle_root/src")
     libs += [
       "d3d9.lib",
       "dxguid.lib",
@@ -148,7 +135,7 @@ shared_library("libEGL") {
   deps = [
     ":libGLESv2",
   ]
-  sources = rebase_path(gles_gypi.libegl_sources, ".", "$angle_root/src")
+  sources = rebase_path(libegl_sources, ".", "$angle_root/src")
   if (is_win) {
     sources += [ "$angle_root/src/libEGL/libEGL.def" ]
   }