diff options
author | Xin Gao <xingao@google.com> | 2017-03-28 08:16:21 +0000 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2017-03-28 19:50:28 +0000 |
commit | 99a5a30d17d920de323d1cc37e3fe25a0749ae41 (patch) | |
tree | 45a5175ddef25ab0bf7c3a82b93dbc1947ee5f28 /tools/jdk/BUILD | |
parent | bcbdb87bb8ee131fbd9631b84b4112843422915f (diff) |
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
Diffstat (limited to 'tools/jdk/BUILD')
-rw-r--r-- | tools/jdk/BUILD | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index cbfe203cda..a4da497246 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/:vanillajavabuilder/' $< > $@", ) 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", ) |