diff options
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 2 | ||||
| -rwxr-xr-x | src/create_embedded_tools.sh | 6 | ||||
| -rwxr-xr-x | 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 ec7156937d..95b59d3556 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 /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ") +LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | 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" " ") LIBRARY_JARS="${LIBRARY_JARS} ${GRPC_LIBRARY_JARS}" diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh index 56ddf8dda2..f478b9f3ab 100755 --- a/src/create_embedded_tools.sh +++ b/src/create_embedded_tools.sh @@ -44,7 +44,7 @@ for i in $*; do *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;; *JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;; *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;; - *javac-9-dev-r3297-4.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ;; + *javac-9-dev-r3297-3.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-3.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 ;; @@ -68,9 +68,9 @@ for i in $*; do chmod u+w "${PACKAGE_DIR}/${OUTPUT_PATH}" done -if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ]; then +if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ]; then cp ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac7.jar \ - ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar + ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar fi cat > "${PACKAGE_DIR}/WORKSPACE" <<EOF diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index ffc1b5813d..004b689524 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -364,8 +364,8 @@ function create_new_workspace() { copy_tools_directory - [ -e third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ] \ - || ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar + [ -e third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ] \ + || ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar touch WORKSPACE } |