diff options
| author |  xingao <xingao@google.com> | 2017-04-03 15:25:18 +0000 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-04-04 10:06:47 +0200 |
| commit | 8df71b5df115df8ed9af196b72ab36683d18c988 (patch) | |
| tree | 000d0915b8ea4a3d97044bcbb818468117090fd2 /src | |
| parent | 2425cd5f85b01e40a3aba1cbc6a6929d4db7423f (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/BUILD | 1 | ||||
| -rwxr-xr-x | src/create_embedded_tools.sh | 2 | ||||
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD | 5 |
3 files changed, 6 insertions, 2 deletions
@@ -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", |