Create a 'vanilla' JavaBuilder

that is portable across JDK versions, and doesn't depend on the javac
distributed with Bazel.

There is no support for Error Prone, strict Java deps, header compilation,
Android desugaring, or any other features that depend on the Bazel javac.

--
PiperOrigin-RevId: 147224490
MOS_MIGRATED_REVID=147224490

1 files changed, 16 insertions, 3 deletions

diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index b47b17ccc3..80d70e957f 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD
@@ -7,10 +7,17 @@ java_binary(
     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 = select({
-        "//tools/jdk:jdk7": ["//third_party/java/jdk/javabuilder:JavaBuilder_0.1.0"],
+        "//tools/jdk:jdk7": [":VanillaJavaBuilder_deploy.jar"],
         "//conditions:default": [":JavaBuilder_deploy.jar"],
     }),
 )
@@ -22,6 +29,12 @@ filegroup(
 )
 
 filegroup(
+    name = "bootstrap_VanillaJavaBuilder_deploy.jar",
+    srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_VanillaJavaBuilder_deploy.jar"],
+    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"],
     visibility = ["//visibility:public"],
@@ -43,7 +56,7 @@ filegroup(
         "//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/resourcejar:srcs",
+        "//src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar:srcs",
     ],
     visibility = ["//src:__pkg__"],
 )
@@ -74,7 +87,7 @@ java_toolchain(
     extclasspath = ["//tools/jdk:extdir"],
     genclass = ["bootstrap_genclass_deploy.jar"],
     ijar = ["//third_party/ijar"],
-    javabuilder = ["//third_party/java/jdk/javabuilder:JavaBuilder_0.1.0"],
+    javabuilder = [":bootstrap_VanillaJavaBuilder_deploy.jar"],
     javac = ["//third_party/java/jdk/langtools:javac7_jar"],
     jvm_opts = [
         "-XX:+TieredCompilation",