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
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools
index 7effede..adfa914 100644
--- a/tools/android/BUILD.tools
+++ b/tools/android/BUILD.tools
@@ -61,13 +61,13 @@
"@local_jdk//:bootclasspath"
],
tools = [
- "@bazel_tools//tools/jdk:SingleJar_binary",
+ "@bazel_tools//tools/jdk:singlejar",
],
outs = ["java_lang_extras.jar"],
cmd = """
for jar in $(locations @local_jdk//:bootclasspath); do
if [[ "$${jar}" == *"/rt.jar" ]]; then
- $(location @bazel_tools//tools/jdk:SingleJar_binary) \
+ $(location @bazel_tools//tools/jdk:singlejar) \
--exclude_build_data \
--dont_change_compression \
--sources $${jar} \
