commit 38d68bc31d69ea9793d925dd3c7d4337330b2b7b
author benjaminwagner <benjaminwagner@google.com> Fri Apr 01 05:00:51 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Apr 01 05:00:51 2016 -0700
tree 91332f70efb790f3834d986b7f1dc6f1b83f8f71
parent 0fba3b97b5b0e3707b31931ab9325030b81c940f

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

Depends on https://codereview.chromium.org/1847923002

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842363002

Review URL: https://codereview.chromium.org/1842363002

public.bzl

diff --git a/public.bzl b/public.bzl
index be43304..14a66a7 100644
--- a/public.bzl
+++ b/public.bzl
@@ -101,8 +101,6 @@
         "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.
 
@@ -399,6 +397,8 @@
         "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",
@@ -413,22 +413,40 @@
         "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
@@ -448,6 +466,7 @@
     "tests",
     "tools",
     "tools/flags",
+    "tools/gpu",
     "tools/timer",
 ]