From 0222b540c586e635b6e99882ca165985bec6d486 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Fri, 24 Jun 2022 11:47:25 -0400 Subject: [PATCH] [bazel] Make modules depend on //:skia_internal Many of these happen to include private headers. Change-Id: If416de1f30639d797406727dd18f350a85c744bb Bug: skia:12541, b/237076898 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/552937 Reviewed-by: Joe Gregorio --- BUILD.bazel | 1 + modules/particles/BUILD.bazel | 2 +- modules/skottie/BUILD.bazel | 2 +- modules/skparagraph/BUILD.bazel | 2 +- modules/skresources/BUILD.bazel | 2 +- modules/skshaper/BUILD.bazel | 2 +- modules/skunicode/BUILD.bazel | 2 +- src/gpu/ganesh/gl/egl/BUILD.bazel | 4 ++++ src/gpu/ganesh/gl/iOS/BUILD.bazel | 4 ++++ src/gpu/ganesh/gl/win/BUILD.bazel | 4 ++++ 10 files changed, 19 insertions(+), 6 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 92c3215ffd..41f823ae82 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -34,6 +34,7 @@ cc_library( ], visibility = [ "//dm:__subpackages__", + "//modules:__subpackages__", "//tests:__subpackages__", "//tools:__subpackages__", ], diff --git a/modules/particles/BUILD.bazel b/modules/particles/BUILD.bazel index b0487b8c4f..42daf8783f 100644 --- a/modules/particles/BUILD.bazel +++ b/modules/particles/BUILD.bazel @@ -10,7 +10,7 @@ cc_library( hdrs = ["//modules/particles/include:hdrs"], visibility = ["//:__subpackages__"], deps = [ - "//:skia_public", + "//:skia_internal", "//modules/skottie", "//modules/skresources", ], diff --git a/modules/skottie/BUILD.bazel b/modules/skottie/BUILD.bazel index 56aa0964df..783e68a54a 100644 --- a/modules/skottie/BUILD.bazel +++ b/modules/skottie/BUILD.bazel @@ -13,7 +13,7 @@ cc_library( hdrs = ["//modules/skottie/include:hdrs"], visibility = ["//:__subpackages__"], deps = [ - "//:skia_public", + "//:skia_internal", "//modules/skresources", "//modules/sksg", "//modules/skshaper", diff --git a/modules/skparagraph/BUILD.bazel b/modules/skparagraph/BUILD.bazel index 652eb5bd7a..4a83e27f9d 100644 --- a/modules/skparagraph/BUILD.bazel +++ b/modules/skparagraph/BUILD.bazel @@ -10,7 +10,7 @@ cc_library( hdrs = ["//modules/skparagraph/include:hdrs"], visibility = ["//:__subpackages__"], deps = [ - "//:skia_public", + "//:skia_internal", "//modules/skshaper", "//modules/skunicode", "//third_party:harfbuzz", diff --git a/modules/skresources/BUILD.bazel b/modules/skresources/BUILD.bazel index 7acf36afe1..f6e8a8e473 100644 --- a/modules/skresources/BUILD.bazel +++ b/modules/skresources/BUILD.bazel @@ -10,6 +10,6 @@ cc_library( hdrs = ["//modules/skresources/include:hdrs"], visibility = ["//:__subpackages__"], deps = [ - "//:skia_public", + "//:skia_internal", ], ) diff --git a/modules/skshaper/BUILD.bazel b/modules/skshaper/BUILD.bazel index 2cbefc5c4e..0403fda72a 100644 --- a/modules/skshaper/BUILD.bazel +++ b/modules/skshaper/BUILD.bazel @@ -10,7 +10,7 @@ cc_library( hdrs = ["//modules/skshaper/include:hdrs"], visibility = ["//:__subpackages__"], deps = [ - "//:skia_public", + "//:skia_internal", ] + select({ "//bazel/common_config_settings:harfbuzz_shaper": [ "//third_party:harfbuzz", diff --git a/modules/skunicode/BUILD.bazel b/modules/skunicode/BUILD.bazel index 52a7a98792..088ffbca71 100644 --- a/modules/skunicode/BUILD.bazel +++ b/modules/skunicode/BUILD.bazel @@ -10,7 +10,7 @@ cc_library( hdrs = ["//modules/skunicode/include:hdrs"], visibility = ["//:__subpackages__"], deps = [ - "//:skia_public", + "//:skia_internal", "//third_party:icu", ], ) diff --git a/src/gpu/ganesh/gl/egl/BUILD.bazel b/src/gpu/ganesh/gl/egl/BUILD.bazel index 69666adff2..a208ecffdf 100644 --- a/src/gpu/ganesh/gl/egl/BUILD.bazel +++ b/src/gpu/ganesh/gl/egl/BUILD.bazel @@ -3,3 +3,7 @@ load("//bazel:macros.bzl", "exports_files_legacy") licenses(["notice"]) exports_files_legacy() + +filegroup( + name = "srcs", +) diff --git a/src/gpu/ganesh/gl/iOS/BUILD.bazel b/src/gpu/ganesh/gl/iOS/BUILD.bazel index 69666adff2..a208ecffdf 100644 --- a/src/gpu/ganesh/gl/iOS/BUILD.bazel +++ b/src/gpu/ganesh/gl/iOS/BUILD.bazel @@ -3,3 +3,7 @@ load("//bazel:macros.bzl", "exports_files_legacy") licenses(["notice"]) exports_files_legacy() + +filegroup( + name = "srcs", +) diff --git a/src/gpu/ganesh/gl/win/BUILD.bazel b/src/gpu/ganesh/gl/win/BUILD.bazel index 69666adff2..a208ecffdf 100644 --- a/src/gpu/ganesh/gl/win/BUILD.bazel +++ b/src/gpu/ganesh/gl/win/BUILD.bazel @@ -3,3 +3,7 @@ load("//bazel:macros.bzl", "exports_files_legacy") licenses(["notice"]) exports_files_legacy() + +filegroup( + name = "srcs", +)