From 72141a1330aaf88d4a44e5fda8541c2cdf915c77 Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Mon, 11 Jun 2018 08:30:15 -0700
Subject: update bazel's embedded jdk to jdk9

- Updates the embedded JDK to Azul Zulu 9.0.7
- All integration tests use Bazel with the embedded JDK

Also updated: http://storage.googleapis.com/bazel-mirror/openjdk/index.html

Closes #5312, #5314, #5315

PiperOrigin-RevId: 200055008
---
 scripts/BUILD | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/BUILD b/scripts/BUILD
index ee6ef86c37..3ff56c4200 100644
--- a/scripts/BUILD
+++ b/scripts/BUILD
@@ -10,19 +10,14 @@ genrule(
     outs = ["bazel-complete.bash"],
     cmd = " ".join([
         "$(location :generate_bash_completion.sh)",
-        "--bazel=$(location //src:bazel)",
-        "--javabase=$(JAVABASE)",
+        "--bazel=$(location //src:bazel_with_jdk)",
         "--output=$@",
         "--prepend=$(location bazel-complete-template.bash)",
     ]),
     output_to_bindir = 1,
-    # Bazel 0.8.0 doesn't have this target under @bazel_tools, so we have to
-    # use it from the main repository
-    toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
     tools = [
         ":generate_bash_completion.sh",
-        "//src:bazel",
-        "//tools/defaults:jdk",
+        "//src:bazel_with_jdk",
     ],
     visibility = ["//scripts/packages:__subpackages__"],
 )
-- 
cgit v1.2.3