diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2017-03-02 18:02:34 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-03-03 10:37:03 +0000 |
| commit | 44fcb229d794a44466a87729e5399dee4c34cf70 (patch) | |
| tree | 50c4a0343d2e2717e3cde3a8512ba795b55a3900 /src | |
| parent | 4e79e80e2899fcc0974e8e89227ad7a6fc48ccc1 (diff) | |
Rollback of commit c3102b722af6fba2a67fdfed55426471c0927ab8.
--
PiperOrigin-RevId: 149015634
MOS_MIGRATED_REVID=149015634
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 } |