diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2017-02-28 20:39:59 -0800 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-03-02 12:47:56 +0100 |
| commit | 30490512eb0e48a3774cc4e4ef78680e77dd4e47 (patch) | |
| tree | 7ca236b2af81128f98a05c9138daf1e2532e459a /src | |
| parent | 105db844833c016550817662791e5c04efb91445 (diff) | |
Update to latest javac and Error Prone
Fixes #2591
Change-Id: I7038b71811c54d5ece1c0993052abdffc9d0de96
Diffstat (limited to 'src')
| -rwxr-xr-x | src/create_embedded_tools.sh | 6 | ||||
| -rwxr-xr-x | src/test/shell/testenv.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh index f478b9f3ab..56ddf8dda2 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-3.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ;; + *javac-9-dev-r3297-4.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-4.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-3.jar ]; then +if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ]; then cp ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac7.jar \ - ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar + ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar fi cat > "${PACKAGE_DIR}/WORKSPACE" <<EOF diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index 004b689524..ffc1b5813d 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-3.jar ] \ - || ln -s "${langtools_path}" third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar + [ -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 touch WORKSPACE } |