Auto-generate BUILD files for src/java_tools/buildjar

This and further changes may contain minor modifications to BUILD files that
don't serve any apparent purpose. The reason for these changes is that we're
switching from checked-in BUILD files to generated BUILD files, and there may
be small differences between these files.

PiperOrigin-RevId: 168201282

12 files changed, 155 insertions, 206 deletions

diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index 2daf5558b5..0d11de9bd0 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD
@@ -1,40 +1,54 @@
+# Description:
+# JavaBuilder and java tools used by Bazel
 package(default_visibility = ["//src:__subpackages__"])
 
+filegroup(
+    name = "srcs",
+    srcs = [
+        "BUILD",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:srcs",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/java/bazel:srcs",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:srcs",
+        "//src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar:srcs",
+        "//src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel:srcs",
+        "//src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine:srcs",
+    ],
+)
+
 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"],
 )
 
 filegroup(
     name = "JavaBuilderDeploy",
     srcs = [":JavaBuilder_deploy.jar"],
+    tags = ["manual"],
 )
 
 filegroup(
     name = "bootstrap_deploy.jar",
     srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_deploy.jar"],
-    visibility = ["//visibility:public"],
+    tags = ["manual"],
 )
 
 filegroup(
     name = "bootstrap_VanillaJavaBuilder_deploy.jar",
     srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_VanillaJavaBuilder_deploy.jar"],
-    visibility = ["//visibility:public"],
+    tags = ["manual"],
 )
 
 filegroup(
     name = "bootstrap_genclass_deploy.jar",
     srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:bootstrap_genclass_deploy.jar"],
-    visibility = ["//visibility:public"],
+    tags = ["manual"],
 )
 
 java_library(
@@ -45,19 +59,6 @@ java_library(
     ],
 )
 
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]) + [
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:srcs",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/java/bazel:srcs",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:srcs",
-        "//src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel:srcs",
-        "//src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine:srcs",
-        "//src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar:srcs",
-    ],
-    visibility = ["//src:__pkg__"],
-)
-
 java_toolchain(
     name = "bootstrap_toolchain",
     bootclasspath = ["//tools/jdk:bootclasspath"],
@@ -74,6 +75,7 @@ java_toolchain(
     ],
     singlejar = ["//src/java_tools/singlejar:bootstrap_deploy.jar"],
     source_version = "8",
+    tags = ["manual"],
     target_version = "8",
     visibility = ["//visibility:public"],
 )
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 3b04bfbd41..698ba60eb6 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,16 +1,22 @@
 # Description:
 #   The Java library builders, which are used by Bazel to compile Java
 #   source code.
+package(default_visibility = ["//src:__subpackages__"])
 
-package_group(
-    name = "packages",
-    packages = [
-        "//src/java_tools/buildjar/...",
+filegroup(
+    name = "srcs",
+    srcs = glob(
+        ["**"],
+        exclude = [
+            "javac/testing/**",
+        ],
+    ) + [
+        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:srcs",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:srcs",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
     ],
 )
 
-package(default_visibility = [":packages"])
-
 java_library(
     name = "optionsparser",
     srcs = [
@@ -41,6 +47,11 @@ java_library(
     ],
 )
 
+alias(
+    name = "jarhelper",
+    actual = "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
+)
+
 # Bazel's BuildJar
 java_library(
     name = "buildjar",
@@ -58,9 +69,9 @@ java_library(
     deps = [
         ":JarOwner",
         ":invalid_command_line_exception",
+        ":jarhelper",
         ":javac",
         ":javac_options",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:errorprone",
@@ -75,7 +86,6 @@ java_library(
 java_binary(
     name = "BazelJavaBuilder",
     main_class = "com.google.devtools.build.buildjar.BazelJavaBuilder",
-    visibility = ["//visibility:public"],
     runtime_deps = [":buildjar"],
 )
 
@@ -84,11 +94,6 @@ java_library(
     srcs = [
         "javac/JavacOptions.java",
     ],
-    visibility = [
-        "//java/com/google/devtools/build/buildjar:__pkg__",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/java/bazel:__pkg__",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:__pkg__",
-    ],
     deps = [
         "//third_party:auto_value",
         "//third_party:guava",
@@ -98,22 +103,12 @@ java_library(
 java_library(
     name = "invalid_command_line_exception",
     srcs = ["InvalidCommandLineException.java"],
-    visibility = [
-        "//java/com/google/devtools/build/buildjar:__subpackages__",
-        "//javatests/com/google/devtools/build/buildjar:__subpackages__",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:__subpackages__",
-    ],
     deps = [],
 )
 
 java_library(
     name = "JarOwner",
     srcs = ["JarOwner.java"],
-    visibility = [
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:__subpackages__",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:__subpackages__",
-        "//src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine:__subpackages__",
-    ],
     deps = [
         "//third_party:auto_value",
         "//third_party:guava",
@@ -121,6 +116,30 @@ java_library(
     ],
 )
 
+java_binary(
+    name = "VanillaJavaBuilder",
+    main_class = "com.google.devtools.build.buildjar.VanillaJavaBuilder",
+    runtime_deps = [":vanilla_java_builder"],
+)
+
+java_library(
+    name = "vanilla_java_builder",
+    srcs = ["VanillaJavaBuilder.java"],
+    deps = [
+        ":jarhelper",
+        ":javac_options",
+        ":optionsparser",
+        "//src/main/protobuf:deps_java_proto",
+        "//src/main/protobuf:java_compilation_java_proto",
+        "//src/main/protobuf:worker_protocol_java_proto",
+        "//third_party:guava",
+    ],
+)
+
+#
+## Bootstrapping using Skylark rules
+#
+
 load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary")
 
 bootstrap_java_library(
@@ -135,11 +154,13 @@ bootstrap_java_library(
         "//third_party/grpc:bootstrap-grpc-jars",
     ],
     neverlink_jars = ["//third_party/java/jdk/langtools:javac_jar"],
+    tags = ["manual"],
 )
 
 bootstrap_java_library(
     name = "bootstrap_invalid_command_line_exception",
     srcs = ["InvalidCommandLineException.java"],
+    tags = ["manual"],
 )
 
 bootstrap_java_binary(
@@ -147,12 +168,12 @@ bootstrap_java_binary(
     srcs = glob(
         ["**/*.java"],
         exclude = [
-            "java/com/google/devtools/build/buildjar/javac/testing/**",
             "JarOwner.java",
             "VanillaJavaBuilder.java",
         ],
     ),
     main_class = "com.google.devtools.build.buildjar.BazelJavaBuilder",
+    tags = ["manual"],
     deps = [
         ":skylark-deps",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:bootstrap_jarhelper",
@@ -168,6 +189,7 @@ bootstrap_java_library(
         "//third_party:auto_value-jars",
         "//third_party:bootstrap_guava_and_error_prone-jars",
     ],
+    tags = ["manual"],
 )
 
 bootstrap_java_binary(
@@ -180,38 +202,9 @@ bootstrap_java_binary(
         "javac/JavacOptions.java",
     ],
     main_class = "com.google.devtools.build.buildjar.VanillaJavaBuilder",
+    tags = ["manual"],
     deps = [
         ":skylark-deps",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:bootstrap_jarhelper",
     ],
 )
-
-java_binary(
-    name = "VanillaJavaBuilder",
-    main_class = "com.google.devtools.build.buildjar.VanillaJavaBuilder",
-    runtime_deps = [":vanilla_java_builder"],
-)
-
-java_library(
-    name = "vanilla_java_builder",
-    srcs = ["VanillaJavaBuilder.java"],
-    deps = [
-        ":javac_options",
-        ":optionsparser",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
-        "//src/main/protobuf:deps_java_proto",
-        "//src/main/protobuf:java_compilation_java_proto",
-        "//src/main/protobuf:worker_protocol_java_proto",
-        "//third_party:guava",
-    ],
-)
-
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]) + [
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:srcs",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:srcs",
-    ],
-    visibility = ["//src/java_tools/buildjar:__pkg__"],
-)
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 d85cf60422..f981f56b36 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,16 +1,13 @@
-package(default_visibility = [":packages"])
+package(default_visibility = ["//src:__subpackages__"])
 
-package_group(
-    name = "packages",
-    packages = [
-        "//src/java_tools/buildjar/...",
-    ],
+filegroup(
+    name = "srcs",
+    srcs = glob(["*.java"]) + ["BUILD"],
 )
 
 java_binary(
     name = "GenClass",
     main_class = "com.google.devtools.build.buildjar.genclass.GenClass",
-    visibility = ["//visibility:public"],
     runtime_deps = [":genclass_lib"],
 )
 
@@ -18,7 +15,7 @@ java_library(
     name = "genclass_lib",
     srcs = glob(["*.java"]),
     deps = [
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:jarhelper",
         "//src/main/protobuf:java_compilation_java_proto",
         "//third_party:guava",
     ],
@@ -28,20 +25,15 @@ java_library(
 ## Bootstrapping using Skylark rules
 #
 
-load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary")
+load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_binary")
 
 bootstrap_java_binary(
     name = "bootstrap_genclass",
     srcs = glob(["*.java"]),
     main_class = "com.google.devtools.build.buildjar.genclass.GenClass",
+    tags = ["manual"],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:skylark-deps",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:bootstrap_jarhelper",
     ],
 )
-
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]),
-    visibility = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:__pkg__"],
-)
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 244e6f4856..5939d3bd75 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,34 +1,15 @@
-package(default_visibility = [":packages"])
-
-package_group(
-    name = "packages",
-    packages = [
-        "//src/java_tools/buildjar/...",
-    ],
-)
-
-JARHELPER_SRCS = [
-    "JarHelper.java",
-    "JarCreator.java",
-]
+package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",
-    # include this BUILD file for the default android tools repository
-    srcs = glob(["**"]),
-    visibility = [
-        "//src:__pkg__",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:__pkg__",
-    ],
+    srcs = glob(["*.java"]) + ["BUILD"],
 )
 
-# JarHelper library for GenClass so it can create the gen jar.
 java_library(
     name = "jarhelper",
-    srcs = JARHELPER_SRCS,
-    visibility = [
-        ":packages",
-        "//src/tools/android/java/com/google/devtools/build/android/idlclass:__pkg__",
+    srcs = [
+        "JarCreator.java",
+        "JarHelper.java",
     ],
 )
 
@@ -36,11 +17,15 @@ java_library(
 ## Bootstrapping using Skylark rules
 #
 
-load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary")
+load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library")
 
 bootstrap_java_library(
     name = "bootstrap_jarhelper",
-    srcs = JARHELPER_SRCS,
+    srcs = [
+        "JarCreator.java",
+        "JarHelper.java",
+    ],
+    tags = ["manual"],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:skylark-deps",
     ],
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 c7c76e4f01..a9e3c09330 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,15 +1,7 @@
 # Description:
 #   Plugins for the Java library builders, which are used by Bazel to
 #   compile Java source code.
-
-package_group(
-    name = "packages",
-    packages = [
-        "//src/java_tools/buildjar/...",
-    ],
-)
-
-package(default_visibility = [":packages"])
+package(default_visibility = ["//src:__subpackages__"])
 
 java_library(
     name = "plugins",
@@ -55,26 +47,28 @@ java_library(
     ],
 )
 
+filegroup(
+    name = "srcs",
+    srcs = glob(["**/*.java"]) + [
+        "BUILD",
+    ],
+)
+
 #
 ## Bootstrapping using Skylark rules
 #
 
-load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary")
+load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library")
 
 bootstrap_java_library(
     name = "bootstrap_plugins",
     srcs = glob(
         ["**/*.java"],
     ),
+    tags = ["manual"],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_JarOwner",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_invalid_command_line_exception",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:skylark-deps",
     ],
 )
-
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]),
-    visibility = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:__pkg__"],
-)
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 e476103534..7176deda43 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
@@ -1,11 +1,11 @@
-package_group(
-    name = "packages",
-    packages = [
-        "//src/java_tools/buildjar/...",
-    ],
-)
+# Description:
+#   Tools for working with Java source code, using the Sun javac API.
+#
+# This is not the source code for javac itself.
 
-package(default_visibility = [":packages"])
+package(
+    default_visibility = ["//src:__subpackages__"],
+)
 
 # Exports the canonical javac bootclasspath artifact locations
 genrule(
@@ -18,16 +18,12 @@ genrule(
 
 # Provides java-level access to the canonical javac bootclasspath
 java_library(
-    name = "javac-bootclasspath-locations-lib",
-    srcs = [":javac-bootclasspath-locations"],
-)
-
-java_library(
     name = "JavacBootclasspath",
-    srcs = ["JavacBootclasspath.java"],
+    srcs = [
+        "JavacBootclasspath.java",
+        ":javac-bootclasspath-locations",
+    ],
     data = ["@bazel_tools//tools/jdk:bootclasspath"],
-    visibility = ["//visibility:public"],
-    deps = [":javac-bootclasspath-locations-lib"],
 )
 
 # Exports the canonical javac jar location
@@ -35,23 +31,18 @@ genrule(
     name = "java-langtools-location",
     srcs = ["//third_party/java/jdk/langtools:javac_jar"],
     outs = ["JavaLangtoolsLocation.java"],
-    cmd = "$(location java-langtools-location.sh) $@ $(GENDIR) $(SRCS)",
+    cmd = "$(location java-langtools-location.sh) $@ $(BINDIR) $(SRCS)",
     tools = ["java-langtools-location.sh"],
 )
 
 # Provides java-level access to the canonical javac jar
 java_library(
-    name = "java-langtools-location-lib",
-    srcs = [":java-langtools-location"],
-    visibility = ["//visibility:private"],
-)
-
-java_library(
     name = "JavaLangtools",
-    srcs = ["JavaLangtools.java"],
+    srcs = [
+        "JavaLangtools.java",
+        ":java-langtools-location",
+    ],
     data = ["//third_party/java/jdk/langtools:javac_jar"],
-    visibility = ["//visibility:public"],
-    deps = [":java-langtools-location-lib"],
 )
 
 # Exports javacopts from the current java toolchain
@@ -83,15 +74,12 @@ genrule(
 
 # Provides java-level access to the javacopts in the current java toolchain
 java_library(
-    name = "javabuilder-javacopts-lib",
-    srcs = [":javabuilder-javacopts"],
-)
-
-java_library(
     name = "JavaBuilderConfig",
-    srcs = ["JavaBuilderConfig.java"],
+    srcs = [
+        "JavaBuilderConfig.java",
+        ":javabuilder-javacopts",
+    ],
     deps = [
-        ":javabuilder-javacopts-lib",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:javac_options",
         "//third_party:guava",
     ],
@@ -103,10 +91,6 @@ java_library(
     name = "BazelJavaCompiler",
     srcs = ["BazelJavaCompiler.java"],
     data = ["//third_party/java/jdk/langtools:javac_jar"],
-    visibility = [
-        "//src:__subpackages__",
-        "//third_party/ijar:__subpackages__",
-    ],
     deps = [
         ":JavaBuilderConfig",
         ":JavaLangtools",
@@ -123,8 +107,18 @@ java_library(
     deps = [":BazelJavaCompiler"],
 )
 
+java_binary(
+    name = "bazeljavac",
+    # Use same stack size as javac and JavaBuilder.
+    jvm_flags = ["-Xss4m"],
+    main_class = "com.google.devtools.build.java.bazel.BazelJavac",
+    runtime_deps = [":BazelJavac"],
+)
+
 filegroup(
     name = "srcs",
-    srcs = glob(["**"]),
-    visibility = ["//src/java_tools/buildjar:__pkg__"],
+    srcs = glob([
+        "*.java",
+        "*.sh",
+    ]) + ["BUILD"],
 )
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 6c109fc22d..55d65813ee 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,14 +1,8 @@
-package(default_visibility = [":packages"])
-
-package_group(
-    name = "packages",
-    packages = ["//src/java_tools/buildjar/..."],
-)
+package(default_visibility = ["//src:__subpackages__"])
 
 java_binary(
     name = "turbine",
     main_class = "com.google.devtools.build.java.turbine.Turbine",
-    visibility = ["//visibility:public"],
     runtime_deps = [":turbine_main"],
 )
 
@@ -24,7 +18,8 @@ java_library(
 
 filegroup(
     name = "srcs",
-    srcs = glob(["**"]) + [
+    srcs = glob(["**/*.java"]) + [
+        "BUILD",
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:srcs",
     ],
 )
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 51631c5aae..0738f614b3 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,9 +1,4 @@
-package(default_visibility = [":packages"])
-
-package_group(
-    name = "packages",
-    packages = ["//src/java_tools/buildjar/..."],
-)
+package(default_visibility = ["//src:__subpackages__"])
 
 java_library(
     name = "javac_turbine",
@@ -68,7 +63,6 @@ java_library(
     srcs = ["JavacTurbineJavaCompiler.java"],
     deps = [
         ":javac_transitive",
-        ":javac_turbine_compile_request",
         ":tree_pruner",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
         "//third_party:jsr305",
@@ -109,6 +103,7 @@ java_library(
 
 filegroup(
     name = "srcs",
-    srcs = glob(["**"]),
-    visibility = ["//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:__pkg__"],
+    srcs = glob(["**/*.java"]) + [
+        "BUILD",
+    ],
 )
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 7c6d5b57ba..9367241910 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,7 +1,8 @@
+package(default_visibility = ["//src:__subpackages__"])
+
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["//src/java_tools/buildjar:__pkg__"],
 )
 
 java_test(
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 9be1d30895..bb194f9b39 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
@@ -2,12 +2,6 @@
 #  Tests for tools for working with Java source code
 package(default_visibility = ["//src:__subpackages__"])
 
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]),
-    visibility = ["//src/java_tools/buildjar:__pkg__"],
-)
-
 java_test(
     name = "BazelJavaCompilerTest",
     size = "small",
@@ -19,7 +13,6 @@ java_test(
         # Simulates how Bazel invokes JavaBuilder
         "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
     ],
-    tags = ["jdk8"],
     test_class = "com.google.devtools.build.java.bazel.BazelJavaCompilerTest",
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/bazel:BazelJavaCompiler",
@@ -29,4 +22,12 @@ java_test(
     ],
 )
 
+filegroup(
+    name = "srcs",
+    srcs = [
+        "BUILD",
+        "BazelJavaCompilerTest.java",
+    ],
+)
+
 test_suite(name = "all_tests")
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 6e3b7dd4dc..cf7c527f42 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,13 +1,9 @@
-package(default_visibility = [":packages"])
-
-package_group(
-    name = "packages",
-    packages = ["//src/java_tools/buildjar/..."],
-)
+package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",
-    srcs = glob(["**"]) + [
+    srcs = glob(["*.java"]) + [
+        "BUILD",
         "//src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac: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 b2c304c2ec..344b4d6e97 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,8 +1,4 @@
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]),
-    visibility = ["//src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine:__pkg__"],
-)
+package(default_visibility = ["//src:__subpackages__"])
 
 java_test(
     name = "JavacTurbineTest",
@@ -14,7 +10,6 @@ java_test(
         # Simulates how Bazel invokes turbine
         "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
     ],
-    tags = ["jdk8"],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:javac_turbine",
         "//src/main/protobuf:deps_java_proto",
@@ -38,7 +33,6 @@ java_test(
         # Simulates how Bazel invokes turbine
         "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
     ],
-    tags = ["jdk8"],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:tree_pruner",
         "//third_party:guava",
@@ -47,3 +41,10 @@ java_test(
         "//third_party/java/jdk/langtools:javac",
     ],
 )
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["*.java"]) + [
+        "BUILD",
+    ],
+)