From 4a404de2c6c38735167e17ab41be45ef6fc4713a Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Wed, 10 May 2017 11:27:39 -0400
Subject: [PATCH] Update javac version to 9-dev-r4023-2

Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
PiperOrigin-RevId: 155630560
---
 scripts/bootstrap/compile.sh | 2 +-
 src/create_embedded_tools.sh | 6 +++---
 src/test/shell/testenv.sh    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 0fce0dc0439fff..e18691c2f96049 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -17,7 +17,7 @@
 # Script for building bazel from scratch without bazel
 
 PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto)
-LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac-9-dev-4023-1.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
+LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac-9-dev-4023-2.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
 GRPC_JAVA_VERSION=0.15.0
 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ")
 # Guava jars are different for JDK 7 build and JDK 8 build, we select the good
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index da55a70e26b94c..a687495645f910 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -37,7 +37,7 @@ for i in $*; do
     *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 @@ if [ -f ${PACKAGE_DIR}/jdk.zip ]; then
   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
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 76838716d34159..c03bce4db99c4f 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -381,8 +381,8 @@ function create_new_workspace() {
 
   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
 }