Replace most uses of macros.bzl with skia_rules.bzl or flags.bzl

//bazel/macros.bzl is a convenient place for symbols, but adds an implicit dependency on our go and python toolchain. The vast majority of our files do not need this and this causes external clients to need to install many extra things in their WORKSPACE file. Using skia_rules.bzl and flags.bzl should allow //:skia_public to be built with no external dependencies (other than bazel_skylib, which most projects use anyway [citation needed]). See also http://cl/516303424 Change-Id: I7ecb94e97514c7147dcddf96840e662c8e3fad66 Bug: skia:14114 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/655856 Reviewed-by: Ben Wagner <[email protected]> Commit-Queue: Kevin Lubick <[email protected]>
HistoryFork · Mar 14, 2023 · a2630de · a2630de
1 parent 06b16dc
commit a2630de
Show file tree

Hide file tree

Showing 197 changed files with 231 additions and 211 deletions.
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
@@ -390,14 +390,15 @@ def _CheckGNIGenerated(input_api, output_api):
   if 'darwin' in sys.platform:
       # This takes too long on Mac with default settings. Probably due to sandboxing.
       return []
+  should_run = False
   for affected_file in input_api.AffectedFiles(include_deletes=True):
     affected_file_path = affected_file.LocalPath()
     if affected_file_path.endswith('BUILD.bazel') or affected_file_path.endswith('.gni'):
-      # Generate GNI files and verify no changes.
-      results = _RunCommandAndCheckGitDiff(output_api,
-              ['make', '-C', 'bazel', 'generate_gni'])
-      if results:
-        return results
+      should_run = True
+  # Generate GNI files and verify no changes.
+  if should_run:
+    return _RunCommandAndCheckGitDiff(output_api,
+            ['make', '-C', 'bazel', 'generate_gni'])
 
   # No Bazel build files changed.
   return []

diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 
 licenses(["notice"])
 

diff --git a/bazel/common_config_settings/BUILD.bazel b/bazel/common_config_settings/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "bool_flag", "selects", "string_flag_with_values")
+load("//bazel:flags.bzl", "bool_flag", "selects", "string_flag_with_values")
 
 licenses(["notice"])
 

diff --git a/bazel/exporter/BUILD.bazel b/bazel/exporter/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 licenses(["notice"])

diff --git a/bazel/exporter/build_proto/analysis_v2/BUILD.bazel b/bazel/exporter/build_proto/analysis_v2/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])

diff --git a/bazel/exporter/build_proto/build/BUILD.bazel b/bazel/exporter/build_proto/build/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])

diff --git a/bazel/exporter/interfaces/BUILD.bazel b/bazel/exporter/interfaces/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])

diff --git a/bazel/exporter/interfaces/mocks/BUILD.bazel b/bazel/exporter/interfaces/mocks/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])

diff --git a/bazel/exporter_tool/BUILD.bazel b/bazel/exporter_tool/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/bazel/flags.bzl b/bazel/flags.bzl
@@ -7,6 +7,10 @@ configure the Skia build.
 
 # https://github.com/bazelbuild/bazel-skylib/blob/main/rules/common_settings.bzl
 load("@bazel_skylib//rules:common_settings.bzl", "string_flag", skylib_bool_flag = "bool_flag")
+load("@bazel_skylib//lib:selects.bzl", _selects = "selects")
+
+# Re-export other symbols from bazel_skylib for convenience
+selects = _selects
 
 # Forked from https://github.com/bazelbuild/bazel-skylib/blob/main/rules/common_settings.bzl
 BuildSettingInfo = provider(

diff --git a/example/BUILD.bazel b/example/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("//bazel:cc_binary_with_flags.bzl", "cc_binary_with_flags")
 
 licenses(["notice"])

diff --git a/experimental/bazel_test/client/BUILD.bazel b/experimental/bazel_test/client/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "generate_cpp_files_for_headers")
+load("//bazel:skia_rules.bzl", "generate_cpp_files_for_headers")
 
 package(features = ["layering_check"])
 

diff --git a/experimental/wasm-hello-world/BUILD.bazel b/experimental/wasm-hello-world/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
 load("//bazel:cc_binary_with_flags.bzl", "cc_binary_with_flags")
 

diff --git a/gn/BUILD.bazel b/gn/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 
 licenses(["notice"])
 

diff --git a/include/BUILD.bazel b/include/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "generate_cpp_files_for_headers", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "generate_cpp_files_for_headers", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/android/BUILD.bazel b/include/android/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/codec/BUILD.bazel b/include/codec/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/config/BUILD.bazel b/include/config/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/core/BUILD.bazel b/include/core/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/docs/BUILD.bazel b/include/docs/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/effects/BUILD.bazel b/include/effects/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/encode/BUILD.bazel b/include/encode/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/BUILD.bazel b/include/gpu/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/d3d/BUILD.bazel b/include/gpu/d3d/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/dawn/BUILD.bazel b/include/gpu/dawn/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/gl/BUILD.bazel b/include/gpu/gl/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/gl/egl/BUILD.bazel b/include/gpu/gl/egl/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/gl/glx/BUILD.bazel b/include/gpu/gl/glx/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/graphite/mtl/BUILD.bazel b/include/gpu/graphite/mtl/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 
 licenses(["notice"])
 

diff --git a/include/gpu/mock/BUILD.bazel b/include/gpu/mock/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/mtl/BUILD.bazel b/include/gpu/mtl/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/gpu/vk/BUILD.bazel b/include/gpu/vk/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/pathops/BUILD.bazel b/include/pathops/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/ports/BUILD.bazel b/include/ports/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/private/BUILD.bazel b/include/private/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/private/base/BUILD.bazel b/include/private/base/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "generate_cpp_files_for_header_list", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "generate_cpp_files_for_header_list", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/private/chromium/BUILD.bazel b/include/private/chromium/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/private/gpu/BUILD.bazel b/include/private/gpu/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/private/gpu/ganesh/BUILD.bazel b/include/private/gpu/ganesh/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/private/gpu/vk/BUILD.bazel b/include/private/gpu/vk/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/sksl/BUILD.bazel b/include/sksl/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/svg/BUILD.bazel b/include/svg/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/third_party/vulkan/BUILD.bazel b/include/third_party/vulkan/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_cc_library")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_cc_library")
 
 licenses(["notice"])
 

diff --git a/include/utils/BUILD.bazel b/include/utils/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/include/utils/mac/BUILD.bazel b/include/utils/mac/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/infra/bots/BUILD.bazel b/infra/bots/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 
 licenses(["notice"])
 

diff --git a/infra/bots/task_drivers/codesize/BUILD.bazel b/infra/bots/task_drivers/codesize/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/compile_wasm_gm_tests/BUILD.bazel b/infra/bots/task_drivers/compile_wasm_gm_tests/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/fm_driver/BUILD.bazel b/infra/bots/task_drivers/fm_driver/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/g3_canary/BUILD.bazel b/infra/bots/task_drivers/g3_canary/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/perf_puppeteer_canvas/BUILD.bazel b/infra/bots/task_drivers/perf_puppeteer_canvas/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/perf_puppeteer_render_skps/BUILD.bazel b/infra/bots/task_drivers/perf_puppeteer_render_skps/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/perf_puppeteer_skottie_frames/BUILD.bazel b/infra/bots/task_drivers/perf_puppeteer_skottie_frames/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/perf_puppeteer_skottie_frames/make_lotties_with_assets/BUILD.bazel b/infra/bots/task_drivers/perf_puppeteer_skottie_frames/make_lotties_with_assets/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/push_apps_from_skia_image/BUILD.bazel b/infra/bots/task_drivers/push_apps_from_skia_image/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/BUILD.bazel b/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/recreate_skps/BUILD.bazel b/infra/bots/task_drivers/recreate_skps/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/run_gn_to_bp/BUILD.bazel b/infra/bots/task_drivers/run_gn_to_bp/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/infra/bots/task_drivers/run_wasm_gm_tests/BUILD.bazel b/infra/bots/task_drivers/run_wasm_gm_tests/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy")
+load("//bazel:skia_rules.bzl", "exports_files_legacy")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 licenses(["notice"])

diff --git a/modules/canvaskit/tests/assets/BUILD.bazel b/modules/canvaskit/tests/assets/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/modules/jetski/BUILD.bazel b/modules/jetski/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_cc_library")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_cc_library")
 
 licenses(["notice"])
 

diff --git a/modules/skcms/BUILD.bazel b/modules/skcms/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_cc_library", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_cc_library", "skia_filegroup")
 
 licenses(["notice"])
 

diff --git a/modules/skottie/BUILD.bazel b/modules/skottie/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//bazel:macros.bzl", "exports_files_legacy", "skia_cc_library")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_cc_library")
 load("//bazel:cc_binary_with_flags.bzl", "cc_binary_with_flags")
 
 licenses(["notice"])