commit 0ad9f5e33c845cd5e26ac34b80d3892cce84f710
author Damien Martin-Guillerez <dmarting@google.com> Wed Apr 20 13:58:08 2016 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Wed Apr 20 14:23:56 2016 +0000
tree b48739f7e14dda53fa91a1ada79855730f7855f5
parent 01e7914245132a07ceb222eb21d1a015b701782d

Refactor JDK 7 build to use the vendored version of it

Along the path, fix the build for JDK 7 and get rid of
most ugliness in the JDK 7 build. Now simply setting
JAVA_VERSION to 1.7 will build a JDK 7 compatible version.

Fixes #1159.

--
Change-Id: I9599283844a57d9e053f12d37445907f22a9232e
Reviewed-on: https://bazel-review.googlesource.com/#/c/3452
MOS_MIGRATED_REVID=120332747

src/create_embedded_tools.sh

diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index e3b751c..8de4837 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -28,7 +28,9 @@
 
 for i in $*; do
   case "$i" in
-    *JavaBuilder_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
+    *tools/jdk/BUILD*) OUTPUT_PATH=tools/jdk/BUILD ;;
+    *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
+    *javac*.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac.jar ;;
     *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
     *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
     *Runner_deploy.jar) OUTPUT_PATH=tools/jdk/TestRunner_deploy.jar ;;