From 032141d73da0b4f24395155f597e9fa5f6298dc3 Mon Sep 17 00:00:00 2001 From: cushon Date: Wed, 25 Apr 2018 13:01:05 -0700 Subject: Remove some references to JDK 7, which is not longer supported PiperOrigin-RevId: 194284627 --- scripts/bootstrap/bootstrap.sh | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'scripts') diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh index 57b5332863..61d4f71910 100755 --- a/scripts/bootstrap/bootstrap.sh +++ b/scripts/bootstrap/bootstrap.sh @@ -31,23 +31,13 @@ fi : ${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() { -- cgit v1.2.3