diff options
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 2 | ||||
| -rw-r--r-- | src/create_embedded_tools.py | 4 | ||||
| -rwxr-xr-x | src/test/shell/testenv.sh | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index c7b26ccc72..3fbd6333a8 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 diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py index 17d747fafc..352069c411 100644 --- a/src/create_embedded_tools.py +++ b/src/create_embedded_tools.py @@ -35,8 +35,8 @@ output_paths = [ ('*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'), diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index b8bc2e02b7..e0bca651c3 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -413,8 +413,8 @@ function create_new_workspace() { 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 } |