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

src/create_embedded_tools.sh

diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index a687495..b5aaa6b 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -39,10 +39,11 @@
     *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;;
     *javac-9-dev-r4023-2.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar ;;
     *javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;;
-    *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
+    *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/singlejar/SingleJar_deploy.jar ;;
     *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
     *ExperimentalRunner_deploy.jar) OUTPUT_PATH=tools/jdk/ExperimentalTestRunner_deploy.jar ;;
     *Runner_deploy.jar) OUTPUT_PATH=tools/jdk/TestRunner_deploy.jar ;;
+    *singlejar) OUTPUT_PATH=tools/jdk/singlejar/singlejar ;;
     *ijar.exe) OUTPUT_PATH=tools/jdk/ijar/ijar.exe ;;
     *ijar) OUTPUT_PATH=tools/jdk/ijar/ijar ;;
     *zipper.exe) OUTPUT_PATH=tools/zip/zipper/zipper.exe ;;