commit 8df71b5df115df8ed9af196b72ab36683d18c988
author xingao <xingao@google.com> Mon Apr 03 15:25:18 2017 +0000
committer Marcel Hlopko <hlopko@google.com> Tue Apr 04 10:06:47 2017 +0200
tree 000d0915b8ea4a3d97044bcbb818468117090fd2
parent 2425cd5f85b01e40a3aba1cbc6a6929d4db7423f

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

src/BUILD

diff --git a/src/BUILD b/src/BUILD
index 8cba362..c658107 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -146,6 +146,7 @@
         "//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",

src/create_embedded_tools.sh

diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index f256f4c..9a0eee5 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -42,7 +42,7 @@
   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 ;;

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

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 3ede677..18694f5 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(
     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",