commit 202d5910a194ae5a0dfbc11692a17e8013017aca
author xingao <xingao@google.com> Thu Jun 01 19:23:29 2017 +0200
committer László Csomor <laszlocsomor@google.com> Fri Jun 02 15:23:24 2017 +0200
tree 080ce0bc4cef9d85e35d994fd25c3a4cd49c825b
parent 1a16736002e466de7975e5461a8898e270b5a3b1

Automated g4 rollback of commit dba22f337a20d3e8f3ac8dfd23bc6fa69e4528da.

*** Reason for rollback ***

Use Java implementation of singlejar on FreeBSD, and roll forward change 157473007.

*** Original change description ***

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: 157729503

tools/jdk/BUILD

diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 005ae91..d526810 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -63,6 +63,17 @@
     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"],
@@ -74,11 +85,6 @@
 )
 
 filegroup(
-    name = "singlejar",
-    srcs = ["//tools/jdk:SingleJar_deploy.jar"],
-)
-
-filegroup(
     name = "javabuilder",
     srcs = ["//tools/jdk:JavaBuilder_deploy.jar"],
 )
@@ -152,7 +158,7 @@
     misc = [
         "-XDskipDuplicateBridges=true",
     ],
-    singlejar = ["@bazel_tools//tools/jdk:SingleJar_deploy.jar"],
+    singlejar = ["@bazel_tools//tools/jdk:singlejar"],
     source_version = "8",
     target_version = "8",
 )
@@ -201,14 +207,3 @@
     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"],
-)