commit 4a404de2c6c38735167e17ab41be45ef6fc4713a
author Liam Miller-Cushon <cushon@google.com> Wed May 10 11:27:39 2017 -0400
committer Kristina Chodorow <kchodorow@google.com> Wed May 10 13:37:30 2017 -0400
tree 85d1eefae50ca56950be715028e05dc8031b2425
parent 20824c1b23ba56188e725c43bf42d7a413827d5b

Update javac version to 9-dev-r4023-2

Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
PiperOrigin-RevId: 155630560

src/create_embedded_tools.sh

diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index da55a70..a687495 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -37,7 +37,7 @@
     *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/${i##*/} ;;
     *JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;;
     *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;;
-    *javac-9-dev-r4023-1.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r4023-1.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 ;;
     *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
@@ -76,9 +76,9 @@
   mv ${PACKAGE_DIR}/zulu* ${PACKAGE_DIR}/jdk
 fi
 
-if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar ]; then
+if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar ]; then
   cp ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac7.jar \
-      ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
+      ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
 fi
 
 cat > "${PACKAGE_DIR}/WORKSPACE" <<EOF

src/test/shell/testenv.sh

diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 7683871..c03bce4 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -381,8 +381,8 @@
 
   copy_tools_directory
 
-  [ -e third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar ] \
-    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
+  [ -e third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar ] \
+    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
 
   touch WORKSPACE
 }