Roll forward change https://cr.bazel.build/9250 with Java 7 build failure fix.

Make Java tool jars available from @bazel_tools.

Now users can point to default Java tool jars in customized
java_toolchain rule defined in project's BUILD file.

PiperOrigin-RevId: 152012191

4 files changed, 36 insertions, 7 deletions

diff --git a/src/BUILD b/src/BUILD
index 8cba362067..c658107c88 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -146,6 +146,7 @@ filegroup(
         "//src/tools/android/java/com/google/devtools/build/android/ziputils:embedded_tools",
         "//src/main/protobuf:srcs",
         "//src/java_tools/buildjar:JavaBuilderDeploy",
+        "//src/java_tools/buildjar:VanillaJavaBuilder_deploy.jar",
         "//src/java_tools/singlejar:SingleJar_deploy.jar",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index f256f4ca34..9a0eee5bb1 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -42,7 +42,7 @@ for i in $*; do
   case "$i" in
     *tools/jdk/BUILD*) OUTPUT_PATH=tools/jdk/BUILD ;;
     *tools/platforms/platforms.BUILD) OUTPUT_PATH=platforms/BUILD ;;
-    *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
+    *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/${i##*/} ;;
     *JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;;
     *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;;
     *javac-9-dev-r3297-4.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ;;
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 3ede677953..18694f5747 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
@@ -90,7 +90,10 @@ java_library(
 java_library(
     name = "JavaBuilderConfig",
     srcs = ["JavaBuilderConfig.java"],
-    data = ["@bazel_tools//tools/jdk:JavaBuilder_deploy.jar"],
+    data = select({
+        "@bazel_tools//tools/jdk:jdk7": ["@bazel_tools//tools/jdk:VanillaJavaBuilder_deploy.jar"],
+        "//conditions:default": ["@bazel_tools//tools/jdk:JavaBuilder_deploy.jar"],
+    }),
     deps = [
         ":javabuilder-javacopts-lib",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:javac_options",
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index cbfe203cda..005ae91602 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -9,7 +9,7 @@ genrule(
     name = "BUILD-jdk7",
     srcs = [":BUILD"],
     outs = ["BUILD.jdk7"],
-    cmd = "sed -e 's/_version = \"8\"/_version = \"7\"/' -e 's/javac_supports_workers = 1/javac_supports_workers = 0/' -e 's/forcibly_disable_header_compilation = 0/forcibly_disable_header_compilation = 1/g' $< > $@",
+    cmd = "sed -e 's/_version = \"8\"/_version = \"7\"/' -e 's/javac_supports_workers = 1/javac_supports_workers = 0/' -e 's/forcibly_disable_header_compilation = 0/forcibly_disable_header_compilation = 1/g' -e 's/:JavaBuilder_deploy/:VanillaJavaBuilder_deploy/' $< > $@",
 )
 
 filegroup(
@@ -63,6 +63,31 @@ filegroup(
     srcs = glob(["ijar/*"]),
 )
 
+filegroup(
+    name = "genclass",
+    srcs = ["//tools/jdk:GenClass_deploy.jar"],
+)
+
+filegroup(
+    name = "turbine",
+    srcs = ["//tools/jdk:turbine_deploy.jar"],
+)
+
+filegroup(
+    name = "singlejar",
+    srcs = ["//tools/jdk:SingleJar_deploy.jar"],
+)
+
+filegroup(
+    name = "javabuilder",
+    srcs = ["//tools/jdk:JavaBuilder_deploy.jar"],
+)
+
+filegroup(
+    name = "vanillajavabuilder",
+    srcs = ["//tools/jdk:VanillaJavaBuilder_deploy.jar"],
+)
+
 BOOTCLASS_JARS = [
     "rt.jar",
     "resources.jar",
@@ -114,10 +139,10 @@ java_toolchain(
     encoding = "UTF-8",
     extclasspath = [":extclasspath"],
     forcibly_disable_header_compilation = 0,
-    genclass = ["//tools/jdk:GenClass_deploy.jar"],
-    header_compiler = ["//tools/jdk:turbine_deploy.jar"],
+    genclass = ["@bazel_tools//tools/jdk:genclass"],
+    header_compiler = ["@bazel_tools//tools/jdk:turbine"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    javabuilder = ["//tools/jdk:JavaBuilder_deploy.jar"],
+    javabuilder = ["@bazel_tools//tools/jdk:javabuilder"],
     javac = ["//third_party/java/jdk/langtools:javac_jar"],
     javac_supports_workers = 1,
     jvm_opts = [
@@ -127,7 +152,7 @@ java_toolchain(
     misc = [
         "-XDskipDuplicateBridges=true",
     ],
-    singlejar = ["//tools/jdk:SingleJar_deploy.jar"],
+    singlejar = ["@bazel_tools//tools/jdk:SingleJar_deploy.jar"],
     source_version = "8",
     target_version = "8",
 )