diff options
| author |  laszlocsomor <laszlocsomor@google.com> | 2017-05-31 12:05:09 +0200 |
|---|---|---|
| committer | László Csomor <laszlocsomor@google.com> | 2017-05-31 13:53:43 +0200 |
| commit | dba22f337a20d3e8f3ac8dfd23bc6fa69e4528da (patch) | |
| tree | d05fa2656ec6e7ace479ba79404716c6eb92ca35 /tools/jdk | |
| parent | 341c08d7c32e539da6246b05ce55c6fe6343b79d (diff) | |
Automated g4 rollback of commit d894345ed88f8adce600b66a310b5210d0bcb59c.
*** Reason for rollback ***
Breaks Bazel on FreeBSD: http://ci.bazel.io/view/Dashboard/job/Bazel/JAVA_VERSION=1.8,PLATFORM_NAME=freebsd-11/1542/console
*** Original change description ***
Use cc implementation of singlejar except on Windows.
Change-Id: Ie4a2db2a6fa1ea86f4bdd42cd806f6804a0c56d4
PiperOrigin-RevId: 157567871
Diffstat (limited to 'tools/jdk')
| -rw-r--r-- | tools/jdk/BUILD | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index d52681033d..005ae91602 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -63,17 +63,6 @@ filegroup( srcs = glob(["ijar/*"]), ) -# On Windows, Java implementation of singlejar is used. We create a little -# filegroup that contains the appropriate platform-dependent file. -# Once https://github.com/bazelbuild/bazel/issues/2241 is fixed (that is, -# the native singlejar is used on windows), this file group can be reused since -# on Windows, executables end in ".exe", but the label we reach it through -# must be platform-independent. -filegroup( - name = "singlejar", - srcs = glob(["singlejar/*"]), -) - filegroup( name = "genclass", srcs = ["//tools/jdk:GenClass_deploy.jar"], @@ -85,6 +74,11 @@ filegroup( ) filegroup( + name = "singlejar", + srcs = ["//tools/jdk:SingleJar_deploy.jar"], +) + +filegroup( name = "javabuilder", srcs = ["//tools/jdk:JavaBuilder_deploy.jar"], ) @@ -158,7 +152,7 @@ java_toolchain( misc = [ "-XDskipDuplicateBridges=true", ], - singlejar = ["@bazel_tools//tools/jdk:singlejar"], + singlejar = ["@bazel_tools//tools/jdk:SingleJar_deploy.jar"], source_version = "8", target_version = "8", ) @@ -207,3 +201,14 @@ java_import( name = "JacocoCoverage", jars = [":JacocoCoverage_deploy.jar"], ) + +java_import( + name = "SingleJar", + jars = ["SingleJar_deploy.jar"], +) + +java_binary( + name = "SingleJar_binary", + main_class = "com.google.devtools.build.singlejar.SingleJar", + runtime_deps = [":SingleJar"], +) |