In public.bzl, change file locations after https://codereview.chromium.org/1815823002

public.bzl

 ################################################################################
 # Skylark macros
 ################################################################################
 
 is_bazel = not hasattr(native, "genmpm")
 
 def portable_select(select_dict, bazel_condition, default_condition):
   """Replaces select() with a Bazel-friendly wrapper.
 
   Args:
@@ skipping 83 matching lines @@
         "src/views/unix/*",
 
         # Exclude multiple definitions.
         # TODO(mtklein): Move to opts?
         "src/pdf/SkDocument_PDF_None.cpp",  # We use src/pdf/SkPDFDocument.cpp.
         "src/gpu/gl/GrGLCreateNativeInterface_none.cpp",
         "src/gpu/gl/GrGLDefaultInterface_native.cpp",
         "src/gpu/gl/GrGLDefaultInterface_none.cpp",
 
         # Exclude files that don't compile with the current DEFINES.
-        "src/gpu/gl/angle/*",  # Requires SK_ANGLE define.
-        "src/gpu/gl/command_buffer/*",  # unknown type name 'HMODULE'
         "src/gpu/gl/mesa/*",  # Requires SK_MESA define.
         "src/svg/parser/*",  # Missing SkSVG.h.
 
         # Conflicting dependencies among Lua versions. See cl/107087297.
         "src/utils/SkLua*",
 
         # Not used.
         "src/animator/**/*",
         "src/views/**/*",
         "src/xml/SkBML_Verbs.h",
@@ skipping 276 matching lines @@
         "tests/*.cpp",
         "tests/*.h",
         "tools/CrashHandler.cpp",
         "tools/CrashHandler.h",
         "tools/ProcStats.cpp",
         "tools/ProcStats.h",
         "tools/Resources.cpp",
         "tools/Resources.h",
         "tools/flags/*.cpp",
         "tools/flags/*.h",
+        "tools/gpu/**/*.cpp",
+        "tools/gpu/**/*.h",
         "tools/random_parse_path.cpp",
         "tools/random_parse_path.h",
         "tools/sk_tool_utils.cpp",
         "tools/sk_tool_utils.h",
         "tools/sk_tool_utils_font.cpp",
         "tools/timer/*.cpp",
         "tools/timer/*.h",
     ],
     exclude = [
         "dm/DMSrcSinkAndroid.cpp",  # Android-only.
         "tests/FontMgrAndroidParserTest.cpp",  # Android-only.
         "tests/PathOpsSkpClipTest.cpp",  # Alternate main.
         "tests/skia_test.cpp",  # Old main.
         "tests/SkpSkGrTest.cpp",  # Alternate main.
+        "tools/gpu/gl/angle/*",
+        "tools/gpu/gl/command_buffer/*",
+        "tools/gpu/gl/egl/*",
+        "tools/gpu/gl/glx/*",
+        "tools/gpu/gl/iOS/*",
+        "tools/gpu/gl/mac/*",
+        "tools/gpu/gl/mesa/*",
+        "tools/gpu/gl/win/*",
         "tools/timer/SysTimer_mach.cpp",
         "tools/timer/SysTimer_windows.cpp",
     ],
 )
 
-DM_SRCS_UNIX = struct()
+DM_SRCS_UNIX = struct(
+    include = [
+        "tools/gpu/gl/CreatePlatformGLContext_none.cpp",
+    ],
+)
 
 DM_SRCS_ANDROID = struct(
     include = [
         # Depends on Android HWUI library that is not available in google3.
         #"dm/DMSrcSinkAndroid.cpp",
         "tests/FontMgrAndroidParserTest.cpp",
+        # TODO(benjaminwagner): Figure out how to compile with EGL.
+        "tools/gpu/gl/CreatePlatformGLContext_none.cpp",
     ],
 )
 
-DM_SRCS_IOS = struct()
+DM_SRCS_IOS = struct(
+    include = [
+        "tools/gpu/iOS/CreatePlatformGLContext_iOS.cpp",
+    ],
+)
 
 ################################################################################
 ## DM_INCLUDES
 ################################################################################
 
 DM_INCLUDES = [
     "dm",
     "gm",
     "src/codec",
     "src/effects",
     "src/effects/gradients",
     "src/fonts",
     "src/pathops",
     "src/pipe/utils",
     "src/ports",
     "tools/debugger",
     "tests",
     "tools",
     "tools/flags",
+    "tools/gpu",
     "tools/timer",
 ]
 
 ################################################################################
 ## DM_ARGS
 ################################################################################
 
 def DM_ARGS(base_dir):
     return [
         "--nogpu",
@@ skipping 74 matching lines @@
 
 LINKOPTS_ANDROID = [
     "-lEGL",
 ]
 
 LINKOPTS_IOS = []
 
 LINKOPTS_ALL = [
     "-ldl",
 ]