Partially revert fca3d391161ae4c92cf289a897db2a1c69a9b334

...as it breaks shell tests

Change-Id: I191ec7c0f36832ff064af0b756a8c8fb41eb2a87
PiperOrigin-RevId: 182509548

scripts/bootstrap/compile.sh

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index c7b26cc..3fbd633 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-3.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 JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ")
 GRPC_JAVA_VERSION=1.7.0
 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ")
 GUAVA_VERSION=23.1

src/create_embedded_tools.py

diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index 17d747f..352069c 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -35,8 +35,8 @@
     ('*JacocoCoverage*_deploy.jar',
      lambda x: 'tools/jdk/JacocoCoverage_deploy.jar'),
     ('*turbine_deploy.jar', lambda x: 'tools/jdk/turbine_deploy.jar'),
-    ('*javac-9-dev-r4023-3.jar',
-     lambda x: 'third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar'),
+    ('*javac-9+181-r4173-1.jar',
+     lambda x: 'third_party/java/jdk/langtools/javac-9+181-r4173-1.jar'),
     ('*SingleJar_deploy.jar',
      lambda x: 'tools/jdk/singlejar/SingleJar_deploy.jar'),
     ('*GenClass_deploy.jar', lambda x: 'tools/jdk/GenClass_deploy.jar'),

src/test/shell/testenv.sh

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