Rewrite visibility handling for all java_tools

PiperOrigin-RevId: 185959149

12 files changed, 54 insertions, 12 deletions

diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index bbd3c4f5a8..ab8aff6ab5 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD
@@ -1,6 +1,6 @@
 # Description:
 # JavaBuilder and java tools used by Bazel
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = [":buildjar_package_group"])
 
 filegroup(
     name = "srcs",
@@ -13,17 +13,28 @@ filegroup(
         "//src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel:srcs",
         "//src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine:srcs",
     ],
+    visibility = ["//:__subpackages__"],
+)
+
+package_group(
+    name = "buildjar_package_group",
+    packages = [
+        "//src/java_tools/buildjar/...",
+        "//src/tools/android/...",
+    ],
 )
 
 java_binary(
     name = "JavaBuilder",
     main_class = "com.google.devtools.build.buildjar.BazelJavaBuilder",
+    visibility = ["//visibility:public"],
     runtime_deps = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar"],
 )
 
 java_binary(
     name = "VanillaJavaBuilder",
     main_class = "com.google.devtools.build.buildjar.VanillaJavaBuilder",
+    visibility = ["//visibility:public"],
     runtime_deps = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:vanilla_java_builder"],
 )
 
@@ -31,24 +42,31 @@ filegroup(
     name = "JavaBuilderDeploy",
     srcs = [":JavaBuilder_deploy.jar"],
     tags = ["manual"],
+    visibility = [
+        ":buildjar_package_group",
+        "//src:__pkg__",
+    ],
 )
 
 filegroup(
     name = "bootstrap_deploy.jar",
     srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_deploy.jar"],
     tags = ["manual"],
+    visibility = ["//visibility:public"],
 )
 
 filegroup(
     name = "bootstrap_VanillaJavaBuilder_deploy.jar",
     srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_VanillaJavaBuilder_deploy.jar"],
     tags = ["manual"],
+    visibility = ["//visibility:public"],
 )
 
 filegroup(
     name = "bootstrap_genclass_deploy.jar",
     srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:bootstrap_genclass_deploy.jar"],
     tags = ["manual"],
+    visibility = ["//visibility:public"],
 )
 
 java_library(
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
index 5690a38298..f2223b9b78 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
@@ -1,7 +1,7 @@
 # Description:
 #   The Java library builders, which are used by Bazel to compile Java
 #   source code.
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 filegroup(
     name = "srcs",
@@ -48,6 +48,10 @@ java_library(
 alias(
     name = "jarhelper",
     actual = "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
+    visibility = [
+        "//src/java_tools/buildjar:buildjar_package_group",
+        "//src/tools/android:__subpackages__",
+    ],
 )
 
 # Bazel's BuildJar
@@ -64,6 +68,7 @@ java_library(
             "VanillaJavaBuilder.java",
         ],
     ),
+    visibility = ["//src/java_tools/buildjar:buildjar_package_group"],
     deps = [
         ":JarOwner",
         ":invalid_command_line_exception",
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
index f981f56b36..bd6e437f72 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 filegroup(
     name = "srcs",
@@ -8,6 +8,11 @@ filegroup(
 java_binary(
     name = "GenClass",
     main_class = "com.google.devtools.build.buildjar.genclass.GenClass",
+    visibility = [
+        "//src:__pkg__",
+        "//src/java_tools/buildjar:buildjar_package_group",
+        "//src/test/shell/bazel:__pkg__",
+    ],
     runtime_deps = [":genclass_lib"],
 )
 
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD
index 5939d3bd75..2947261fef 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD
@@ -1,8 +1,12 @@
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 filegroup(
     name = "srcs",
     srcs = glob(["*.java"]) + ["BUILD"],
+    visibility = [
+        "//src:__pkg__",
+        "//src/java_tools/buildjar:buildjar_package_group",
+    ],
 )
 
 java_library(
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
index ef40584c53..cf8096bd0e 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
@@ -1,7 +1,7 @@
 # Description:
 #   Plugins for the Java library builders, which are used by Bazel to
 #   compile Java source code.
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 java_library(
     name = "plugins",
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD
index d0d0174968..4816cd8216 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD
@@ -4,7 +4,7 @@
 # This is not the source code for javac itself.
 
 package(
-    default_visibility = ["//src:__subpackages__"],
+    default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"],
 )
 
 load(":build_defs.bzl", "default_javacopts")
@@ -26,6 +26,7 @@ java_library(
         ":javac-bootclasspath-locations",
     ],
     data = ["@bazel_tools//tools/jdk:bootclasspath"],
+    visibility = ["//visibility:public"],
     deps = ["//third_party:guava"],
 )
 
@@ -46,6 +47,7 @@ java_library(
         ":java-langtools-location",
     ],
     data = ["//third_party/java/jdk/langtools:javac_jar"],
+    visibility = ["//visibility:public"],
 )
 
 # Exports javacopts from the current java toolchain
@@ -62,6 +64,7 @@ java_library(
         "JavaBuilderConfig.java",
         "JavaBuilderJavacOpts.java",
     ],
+    visibility = ["//visibility:public"],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:javac_options",
         "//third_party:guava",
@@ -74,6 +77,7 @@ java_library(
     name = "BazelJavaCompiler",
     srcs = ["BazelJavaCompiler.java"],
     data = ["//third_party/java/jdk/langtools:javac_jar"],
+    visibility = ["//visibility:public"],
     deps = [
         ":JavaBuilderConfig",
         ":JavaLangtools",
@@ -87,6 +91,7 @@ java_library(
 java_library(
     name = "BazelJavac",
     srcs = ["BazelJavac.java"],
+    visibility = ["//visibility:public"],
     deps = [":BazelJavaCompiler"],
 )
 
@@ -95,6 +100,7 @@ java_binary(
     # Use same stack size as javac and JavaBuilder.
     jvm_flags = ["-Xss4m"],
     main_class = "com.google.devtools.build.java.bazel.BazelJavac",
+    visibility = ["//visibility:public"],
     runtime_deps = [":BazelJavac"],
 )
 
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD
index 55d65813ee..f3cafee714 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD
@@ -1,8 +1,12 @@
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 java_binary(
     name = "turbine",
     main_class = "com.google.devtools.build.java.turbine.Turbine",
+    visibility = [
+        "//:__subpackages__",
+        "//src/java_tools/buildjar:buildjar_package_group",
+    ],
     runtime_deps = [":turbine_main"],
 )
 
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD
index 0738f614b3..8391655d25 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 java_library(
     name = "javac_turbine",
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/BUILD
index 9367241910..c680e4f12a 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 filegroup(
     name = "srcs",
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
index bb194f9b39..5c59fe38f8 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
@@ -1,6 +1,6 @@
 # Description:
 #  Tests for tools for working with Java source code
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 java_test(
     name = "BazelJavaCompilerTest",
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/BUILD
index cf7c527f42..73cea18cae 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 filegroup(
     name = "srcs",
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
index a77f3a32fc..701f380d64 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//src:__subpackages__"])
+package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"])
 
 java_library(
     name = "AbstractJavacTurbineCompilationTest",