Update public.bzl based on internal cl/128616707.

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 37 matching lines @@
     if hasattr(srcs, 'exclude'):
       return native.glob(srcs.include, exclude=srcs.exclude)
     else:
       return native.glob(srcs.include)
   return []
 
 ################################################################################
 ## PRIVATE_HDRS
 ################################################################################
 
-PRIVATE_HDRS_LIST = [
-    "include/private/**/*",
-    "src/utils/SkWhitelistChecksums.inc",
+PRIVATE_HDRS_INCLUDE_LIST = [
+    "include/private/**/*.h",
+    "src/**/*.inc",
 ]
 
 PRIVATE_HDRS = struct(
-    include = PRIVATE_HDRS_LIST,
+    include = PRIVATE_HDRS_INCLUDE_LIST,
+)
+
+ALL_HDRS = struct(
+    include = [
+        "src/**/*.h",
+        "include/**/*.h",
+    ],
 )
 
 ################################################################################
 ## BASE_SRCS
 ################################################################################
 
 # All platform-independent SRCS.
 BASE_SRCS_ALL = struct(
     include = [
         "src/**/*.h",
         "src/**/*.cpp",
 
         # Third Party
         "third_party/etc1/*.cpp",
         "third_party/etc1/*.h",
         "third_party/ktx/*.cpp",
         "third_party/ktx/*.h",
     ],
-    exclude = PRIVATE_HDRS_LIST + [
+    # Note: PRIVATE_HDRS_INCLUDE_LIST is excluded from BASE_SRCS_ALL here
+    # because they are required to appear in srcs for some rules but hdrs for
+    # other rules. See internal cl/119566959.
+    exclude = PRIVATE_HDRS_INCLUDE_LIST + [
         # Exclude platform-dependent files.
         "src/android/*",
         "src/codec/*",
         "src/device/xps/*",  # Windows-only. Move to ports?
         "src/doc/*_XPS.cpp",  # Windows-only. Move to ports?
         "src/fonts/SkFontMgr_fontconfig.cpp",
         "src/gpu/gl/android/*",
         "src/gpu/gl/egl/*",
         "src/gpu/gl/glfw/*",
         "src/gpu/gl/glx/*",
@@ skipping 20 matching lines @@
 
         # Exclude files that don't compile with the current DEFINES.
         "src/gpu/gl/mesa/*",  # Requires SK_MESA define.
         "src/svg/**/*",  # Depends on XML.
         "src/xml/**/*",
 
         # Conflicting dependencies among Lua versions. See cl/107087297.
         "src/utils/SkLua*",
 
         # Not used.
-        "src/animator/**/*",
         "src/views/**/*",
 
         # Currently exclude all vulkan specific files
         "src/gpu/vk/*",
         "src/sksl/**/*",
     ],
 )
 
 # Platform-dependent SRCS for google3-default platform.
 BASE_SRCS_UNIX = struct(
@@ skipping 178 matching lines @@
 )
 
 ################################################################################
 ## BASE_HDRS
 ################################################################################
 
 BASE_HDRS = struct(
     include = [
         "include/**/*.h",
     ],
-    exclude = PRIVATE_HDRS_LIST + [
+    exclude = PRIVATE_HDRS_INCLUDE_LIST + [
         # Not used.
         "include/animator/**/*",
         "include/views/**/*",
     ],
 )
 
 ################################################################################
 ## BASE_DEPS
 ################################################################################
 
@@ skipping 54 matching lines @@
 
 DM_SRCS_ALL = struct(
     include = [
         "dm/*.cpp",
         "dm/*.h",
         "gm/*.c",
         "gm/*.cpp",
         "gm/*.h",
         "tests/*.cpp",
         "tests/*.h",
+        "tools/BigPathBench.inc",
         "tools/CrashHandler.cpp",
         "tools/CrashHandler.h",
         "tools/ProcStats.cpp",
         "tools/ProcStats.h",
         "tools/Resources.cpp",
         "tools/Resources.h",
+        "tools/SkJSONCPP.h",
+        "tools/UrlDataManager.cpp",
+        "tools/UrlDataManager.h",
+        "tools/debugger/*.cpp",
+        "tools/debugger/*.h",
         "tools/flags/*.cpp",
         "tools/flags/*.h",
         "tools/gpu/**/*.cpp",
         "tools/gpu/**/*.h",
         "tools/picture_utils.cpp",
+        "tools/picture_utils.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_flags.h",
         "tools/sk_tool_utils_font.cpp",
+        "tools/test_font_monospace.inc",
+        "tools/test_font_sans_serif.inc",
+        "tools/test_font_serif.inc",
+        "tools/test_font_index.inc",
         "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.
         "tests/SkSLErrorTest.cpp",  # Excluded along with Vulkan.
@@ skipping 40 matching lines @@
 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/debugger",
     "tools/flags",
     "tools/gpu",
     "tools/timer",
 ]
 
 ################################################################################
 ## DM_ARGS
 ################################################################################
 
 def DM_ARGS(base_dir, asan):
@@ skipping 125 matching lines @@
 
 LINKOPTS_ANDROID = [
     "-lEGL",
 ]
 
 LINKOPTS_IOS = []
 
 LINKOPTS_ALL = [
     "-ldl",
 ]