diff options
author | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-20 13:58:08 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-20 14:23:56 +0000 |
commit | 0ad9f5e33c845cd5e26ac34b80d3892cce84f710 (patch) | |
tree | b48739f7e14dda53fa91a1ada79855730f7855f5 /src/java_tools/buildjar | |
parent | 01e7914245132a07ceb222eb21d1a015b701782d (diff) |
Refactor JDK 7 build to use the vendored version of it
Along the path, fix the build for JDK 7 and get rid of
most ugliness in the JDK 7 build. Now simply setting
JAVA_VERSION to 1.7 will build a JDK 7 compatible version.
Fixes #1159.
--
Change-Id: I9599283844a57d9e053f12d37445907f22a9232e
Reviewed-on: https://bazel-review.googlesource.com/#/c/3452
MOS_MIGRATED_REVID=120332747
Diffstat (limited to 'src/java_tools/buildjar')
-rw-r--r-- | src/java_tools/buildjar/BUILD | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD index f7f53a7ae6..56298dfd1a 100644 --- a/src/java_tools/buildjar/BUILD +++ b/src/java_tools/buildjar/BUILD @@ -8,6 +8,14 @@ java_binary( ) filegroup( + name = "JavaBuilderDeploy", + srcs = select({ + "//tools/jdk:jdk7": ["//third_party/java/jdk/javabuilder:JavaBuilder_0.1.0"], + "//conditions:default": [":JavaBuilder_deploy.jar"], + }), +) + +filegroup( name = "bootstrap_deploy.jar", srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_deploy.jar"], visibility = ["//visibility:public"], @@ -52,3 +60,19 @@ java_toolchain( target_version = "8", visibility = ["//visibility:public"], ) + +java_toolchain( + name = "bootstrap_toolchain_jdk7", + bootclasspath = ["//tools/jdk:bootclasspath"], + encoding = "UTF-8", + extclasspath = ["//tools/jdk:extdir"], + genclass = ["bootstrap_genclass_deploy.jar"], + ijar = ["//third_party/ijar"], + javabuilder = ["//third_party/java/jdk/javabuilder:JavaBuilder_0.1.0"], + javac = ["//third_party/java/jdk/langtools:javac7_jar"], + jvm_opts = ["-client"], + singlejar = ["//src/java_tools/singlejar:bootstrap_deploy.jar"], + source_version = "7", + target_version = "7", + visibility = ["//visibility:public"], +) |