commit 032141d73da0b4f24395155f597e9fa5f6298dc3
author cushon <cushon@google.com> Wed Apr 25 13:01:05 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Apr 25 13:02:17 2018 -0700
tree 90da7b883fbe1aec356a498b056ec35b1bb548ce
parent 8ab09072ef45f0f5a60d77451a2e3a573c9c4c1c

Remove some references to JDK 7, which is not longer supported

PiperOrigin-RevId: 194284627

scripts/bootstrap/bootstrap.sh

diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index 57b5332..61d4f71 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -31,23 +31,13 @@
 
 : ${JAVA_VERSION:="1.8"}
 
-if [ "${JAVA_VERSION}" = "1.7" ]; then
-  _BAZEL_ARGS="--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain_jdk7 \
-        --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain_jdk7 \
-        --spawn_strategy=standalone \
-        --nojava_header_compilation \
-        --define JAVA_VERSION=1.7 --ignore_unsupported_sandboxing \
-        --compilation_mode=opt \
-        ${EXTRA_BAZEL_ARGS:-}"
-else
-  _BAZEL_ARGS="--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
-        --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
-        --spawn_strategy=standalone \
-        --nojava_header_compilation \
-        --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \
-        --compilation_mode=opt \
-        ${EXTRA_BAZEL_ARGS:-}"
-fi
+_BAZEL_ARGS="--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
+      --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
+      --spawn_strategy=standalone \
+      --nojava_header_compilation \
+      --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \
+      --compilation_mode=opt \
+      ${EXTRA_BAZEL_ARGS:-}"
 
 if [ -z "${BAZEL-}" ]; then
   function _run_bootstrapping_bazel() {