Pass GN header visibility check.

.gn

@@ -22,7 +22,7 @@ secondary_source = "//build/secondary/"
 # matching these patterns (see "gn help label_pattern" for format) will have
 # their includes checked for proper dependencies when you run either
 # "gn check" or "gn gen --check".
-check_targets = []
+check_targets = ["*"]
 
 # These are the list of GN files that run exec_script. This whitelist exists
 # to force additional review for new uses of exec_script, which is strongly

BUILD.gn

@@ -887,13 +887,9 @@ source_set("angle_util_loader_headers") {
     "util/util_export.h",
   ]
 
-  public_configs = [
-    ":angle_util_config",
-    ":angle_util_loader_config",
-    ":extra_warnings",
-    ":internal_config",
-    ":no_gl_prototypes",
-  ]
+  if (is_win) {
+    sources += [ "util/windows/wgl_loader_autogen.h" ]
+  }
 
   public_deps = [
     ":includes",
@@ -909,12 +905,21 @@ source_set("angle_util_loader") {
   ]
 
   if (is_win) {
-    sources += util_wgl_sources
+    sources += [ "util/windows/wgl_loader_autogen.cpp" ]
   }
 
-  public_deps = [
+  deps = [
     ":angle_util_loader_headers",
   ]
+
+  public_configs = [
+    ":angle_util_config",
+    ":angle_util_loader_config",
+    ":internal_config",
+    ":no_gl_prototypes",
+  ]
+
+  configs += [ ":extra_warnings" ]
 }
 
 config("angle_util_config") {
@@ -943,7 +948,7 @@ foreach(is_shared_library,
     sources = util_sources
 
     if (is_win) {
-      sources += util_win32_sources
+      sources += util_win_sources
     }
 
     libs = []
@@ -998,6 +1003,7 @@ foreach(is_shared_library,
 
     deps = [
       ":angle_common",
+      ":angle_util_loader_headers",
     ]
 
     if (is_shared_library) {
@@ -1011,8 +1017,13 @@ foreach(is_shared_library,
         public_configs += [ ":shared_library_public_config" ]
       }
 
-      deps += [ ":angle_util_loader" ]
-      public_configs += [ ":no_gl_prototypes" ]
+      if (is_win) {
+        sources += util_win_shared_sources
+      }
+
+      public_deps = [
+        ":angle_util_loader",
+      ]
     } else {
       public_configs += [
         ":angle_static",

util/util.gni

@@ -26,7 +26,7 @@ util_sources = [
   "util/Timer.h",
 ]
 
-util_win32_sources = [
+util_win_sources = [
   "util/windows/win32/Win32_system_utils.cpp",
   "util/windows/win32/Win32Pixmap.cpp",
   "util/windows/win32/Win32Pixmap.h",
@@ -37,11 +37,9 @@ util_win32_sources = [
   "util/windows/WindowsTimer.h",
 ]
 
-util_wgl_sources = [
+util_win_shared_sources = [
   "util/windows/WGLWindow.cpp",
   "util/windows/WGLWindow.h",
-  "util/windows/wgl_loader_autogen.cpp",
-  "util/windows/wgl_loader_autogen.h",
 ]
 
 util_winrt_sources = [

util/util_gl.h

@@ -11,6 +11,9 @@
 #if defined(ANGLE_USE_UTIL_LOADER)
 #    include "util/egl_loader_autogen.h"
 #    include "util/gles_loader_autogen.h"
+#    if defined(ANGLE_PLATFORM_WINDOWS)
+#        include "util/windows/wgl_loader_autogen.h"
+#    endif  // defined(ANGLE_PLATFORM_WINDOWS)
 #else
 
 #    if !defined(GL_GLES_PROTOTYPES)
@@ -20,6 +23,6 @@
 #    include <EGL/egl.h>
 #    include <EGL/eglext.h>
 #    include "angle_gl.h"
-#endif
+#endif  // defined(ANGLE_USE_UTIL_LOADER)
 
 #endif  // UTIL_GL_H_

util/windows/WGLWindow.cpp

@@ -11,9 +11,7 @@
 
 #include "common/string_utils.h"
 #include "util/OSWindow.h"
-#include "util/gles_loader_autogen.h"
 #include "util/system_utils.h"
-#include "util/windows/wgl_loader_autogen.h"
 
 #include <iostream>