Make the end2end tests compile in the GN build.

BUILD.gn

@@ -105,6 +105,7 @@ config("translator_static_config") {
   defines = [ "ANGLE_TRANSLATOR_STATIC" ]
 }
 
+
 config("debug_annotations_config") {
   if (is_debug) {
     defines = [
@@ -219,10 +220,20 @@ config("libANGLE_config") {
     defines += [ "ANGLE_USE_X11" ]
   }
   defines += [
-    "GL_APICALL=",
     "GL_GLEXT_PROTOTYPES=",
-    "EGLAPI=",
   ]
+
+  if (is_win) {
+    defines += [
+      "GL_APICALL=",
+      "EGLAPI=",
+    ]
+  } else {
+    defines += [
+      "GL_APICALL=__attribute__((visibility(\"default\")))",
+      "EGLAPI=__attribute__((visibility(\"default\")))",
+    ]
+  }
   if (is_win) {
     cflags += [ "/wd4530" ]  # C++ exception handler used, but unwind semantics are not enabled.
   }
@@ -337,6 +348,7 @@ shared_library("libEGL") {
   configs += [
     ":internal_config",
     ":commit_id_config",
+    ":debug_annotations_config",
     ":libANGLE_config",
     "//build/config/compiler:no_chromium_code",
   ]
@@ -350,3 +362,43 @@ shared_library("libEGL") {
     ":libGLESv2",
   ]
 }
+
+util_gypi = exec_script(
+  "//build/gypi_to_gn.py",
+  [ rebase_path("util/util.gyp") ],
+  "scope",
+  [ "util/util.gyp" ])
+
+static_library("angle_util") {
+  sources = rebase_path(util_gypi.util_sources, ".", "util")
+
+  if (is_win) {
+    sources += rebase_path(util_gypi.util_win32_sources, ".", "util")
+  }
+
+  if (is_linux) {
+    sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
+  }
+
+  if (is_mac) {
+    sources += rebase_path(util_gypi.util_osx_sources, ".", "util")
+  }
+
+  if (use_x11) {
+    sources += rebase_path(util_gypi.util_x11_sources, ".", "util")
+  }
+
+  configs += [
+    ":internal_config",
+    ":debug_annotations_config",
+  ]
+
+  include_dirs = [
+    "util",
+  ]
+
+  deps = [
+    ":libEGL",
+    ":libGLESv2",
+  ]
+}

src/tests/BUILD.gn

@@ -37,3 +37,45 @@ test("angle_unittests") {
     "//third_party/angle:translator_static",
   ]
 }
+
+end2end_gypi = exec_script(
+  "//build/gypi_to_gn.py",
+  [ rebase_path("angle_end2end_tests.gypi"), "--replace=<(angle_path)=." ],
+  "scope",
+  [ "angle_unittests.gypi" ])
+
+test("angle_end2end_tests") {
+  include_dirs = [
+    "testing/gtest/include",
+    "../../src/tests",
+    "../../util",
+  ]
+
+  sources = rebase_path(end2end_gypi.angle_end2end_tests_sources, ".", "../..")
+
+  if (is_win) {
+    sources += rebase_path(end2end_gypi.angle_end2end_tests_win_sources, ".", "../..")
+  }
+
+  sources += [
+    "//gpu/angle_end2end_tests_main.cc",
+  ]
+
+  configs += [
+    "//third_party/angle:internal_config",
+    "//third_party/angle:libANGLE_config",
+  ]
+
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/angle:angle_util",
+    "//third_party/angle:libANGLE",
+    "//third_party/angle:libEGL",
+    "//third_party/angle:libGLESv2",
+    "//third_party/angle:preprocessor",
+    "//third_party/angle:translator_static",
+  ]
+}

src/tests/angle_end2end_tests.gypi

@@ -9,9 +9,10 @@
 # gtest harness in a main.cpp.
 
 {
+    # Everything below this is duplicated in the GN build.
+    # If you change anything also change angle/src/tests/BUILD.gn
     'variables':
     {
-        # This file list will be shared with the GN build.
         'angle_end2end_tests_sources':
         [
             '<(angle_path)/src/tests/gl_tests/BlendMinMaxTest.cpp',

src/tests/angle_unittests.gypi

@@ -83,7 +83,7 @@
         ],
     },
     # Everything below this but the WinRT configuration is duplicated in the GN build.
-    # If you change anything also change angle/BUILD.gn
+    # If you change anything also change angle/src/tests/BUILD.gn
     'dependencies':
     [
         '<(angle_path)/src/angle.gyp:libANGLE',

util/util.gyp

@@ -3,6 +3,8 @@
 # found in the LICENSE file.
 
 {
+    # Everything below  this is duplicated in the GN build, except Mac support.
+    # If you change anything also change angle/BUILD.gn
     'variables':
     {
         'util_sources':