Rewrite visibility handling for all java_tools

PiperOrigin-RevId: 185959149

5 files changed, 21 insertions, 23 deletions

diff --git a/src/java_tools/singlejar/BUILD b/src/java_tools/singlejar/BUILD
index f27e78e67c..332bb57457 100644
--- a/src/java_tools/singlejar/BUILD
+++ b/src/java_tools/singlejar/BUILD
@@ -1,7 +1,7 @@
 # Description:
 #   SingleJar combines multiple zip files and additional files
 #   into a single zip file.
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools:__subpackages__"])
 
 filegroup(
     name = "srcs",
@@ -11,21 +11,30 @@ filegroup(
         "//src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar:srcs",
         "//src/java_tools/singlejar/javatests/com/google/devtools/build/zip:srcs",
     ],
+    visibility = ["//:__subpackages__"],
+)
+
+package_group(
+    name = "singlejar_package_group",
+    packages = ["//src/java_tools/singlejar/..."],
 )
 
 alias(
     name = "libSingleJar",
     actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:libSingleJar",
+    visibility = ["//visibility:public"],
 )
 
 alias(
     name = "SingleJar",
     actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar",
+    visibility = ["//visibility:public"],
 )
 
 alias(
     name = "SingleJar_deploy.jar",
     actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar_deploy.jar",
+    visibility = ["//visibility:public"],
 )
 
 alias(
diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
index b57dd8064f..c74eb6e5b6 100644
--- a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
+++ b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
@@ -1,17 +1,7 @@
 # Description:
 #   SingleJar combines multiple zip files and additional files
 #   into a single zip file.
-package(default_visibility = ["//src:__subpackages__"])
-
-package_group(
-    name = "packages",
-    packages = [
-        "//java/com/google/devtools/build/singlejar",
-        "//javatests/com/google/devtools/build/singlejar",
-        "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar",
-        "//src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar",
-    ],
-)
+package(default_visibility = ["//src/java_tools/singlejar:singlejar_package_group"])
 
 filegroup(
     name = "srcs",
@@ -29,6 +19,7 @@ java_library(
         "ZipCombiner.java",
         "ZipEntryFilter.java",
     ],
+    visibility = ["//visibility:public"],
     deps = [
         "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
         "//third_party:jsr305",
@@ -52,6 +43,10 @@ java_binary(
     name = "bazel-singlejar",
     srcs = glob(["*.java"]),
     main_class = "com.google.devtools.build.singlejar.SingleJar",
+    visibility = [
+        "//:__subpackages__",
+        "//src/java_tools/singlejar:singlejar_package_group",
+    ],
     deps = [
         "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
         "//src/main/java/com/google/devtools/build/lib/shell",
@@ -84,6 +79,7 @@ bootstrap_java_binary(
     ],
     main_class = "com.google.devtools.build.singlejar.SingleJar",
     tags = ["manual"],
+    visibility = ["//visibility:public"],
     deps = [
         ":skylark-deps",
         "//src/main/java/com/google/devtools/build/lib/shell:shell-skylark",
diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD
index 00292119c1..4cadbdf110 100644
--- a/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD
+++ b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD
@@ -2,15 +2,7 @@
 #   Zip provides a library for reading and writing zip files, allowing more
 #   advanced manipulation than the JDK equivalents by providing detailed zip
 #   entry data and raw file access.
-package(default_visibility = ["//src:__subpackages__"])
-
-package_group(
-    name = "packages",
-    packages = [
-        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
-        "//src/java_tools/singlejar/javatests/com/google/devtools/build/zip",
-    ],
-)
+package(default_visibility = ["//src/java_tools/singlejar:singlejar_package_group"])
 
 filegroup(
     name = "srcs",
@@ -26,5 +18,6 @@ filegroup(
 java_library(
     name = "zip",
     srcs = glob(["*.java"]),
+    visibility = ["//visibility:public"],
     deps = ["//third_party:jsr305"],
 )
diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD
index e8ac3738a7..ce83ab01c5 100644
--- a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD
+++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD
@@ -1,6 +1,6 @@
 # Description:
 #   Tests for SingleJar
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/singlejar:singlejar_package_group"])
 
 java_library(
     name = "libSingleJarTesting",
diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD
index db24dd5838..269df1d9ff 100644
--- a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD
+++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD
@@ -1,6 +1,6 @@
 # Description:
 #   Tests for Zip
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/singlejar:singlejar_package_group"])
 
 java_library(
     name = "zip_tests",