commit 99a5a30d17d920de323d1cc37e3fe25a0749ae41
author Xin Gao <xingao@google.com> Tue Mar 28 08:16:21 2017 +0000
committer Philipp Wollermann <philwo@google.com> Tue Mar 28 19:50:28 2017 +0000
tree 45a5175ddef25ab0bf7c3a82b93dbc1947ee5f28
parent bcbdb87bb8ee131fbd9631b84b4112843422915f

Make Java tool jars available from @bazel_tools. 

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

--
Change-Id: I064c9646e8681a3f5669d7163b1b3cb5cc0b16b7
Reviewed-on: https://cr.bazel.build/9250
PiperOrigin-RevId: 151422924
MOS_MIGRATED_REVID=151422924

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 ;;

tools/jdk/BUILD

diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index cbfe203..a4da497 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -9,7 +9,7 @@
     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/:vanillajavabuilder/' $< > $@",
 )
 
 filegroup(
@@ -63,6 +63,31 @@
     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 @@
     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 @@
     misc = [
         "-XDskipDuplicateBridges=true",
     ],
-    singlejar = ["//tools/jdk:SingleJar_deploy.jar"],
+    singlejar = ["@bazel_tools//tools/jdk:SingleJar_deploy.jar"],
     source_version = "8",
     target_version = "8",
 )