Use VanillaJavaBuilder for bootstrapping

PiperOrigin-RevId: 194504697

src/java_tools/buildjar/BUILD

@@ -48,13 +48,6 @@ filegroup(
     ],
 )
 
-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"],
@@ -89,7 +82,7 @@ java_toolchain(
     extclasspath = [],
     genclass = ["bootstrap_genclass_deploy.jar"],
     ijar = ["//third_party/ijar"],
-    javabuilder = ["bootstrap_deploy.jar"],
+    javabuilder = ["bootstrap_VanillaJavaBuilder_deploy.jar"],
     javac = ["//third_party/java/jdk/langtools:javac_jar"],
     jvm_opts = [
         # Prevent "Could not reserve enough space for object heap" errors on Windows.

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD

@@ -167,25 +167,6 @@ bootstrap_java_library(
     tags = ["manual"],
 )
 
-bootstrap_java_binary(
-    name = "bootstrap",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = [
-            "JarOwner.java",
-            "VanillaJavaBuilder.java",
-            "javac/testing/**",
-        ],
-    ),
-    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",
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:bootstrap_plugins",
-    ],
-)
-
 bootstrap_java_library(
     name = "bootstrap_JarOwner",
     srcs = ["JarOwner.java"],