diff options
| author |  cushon <cushon@google.com> | 2018-06-11 08:30:15 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-11 08:31:36 -0700 |
| commit | 72141a1330aaf88d4a44e5fda8541c2cdf915c77 (patch) | |
| tree | a218af7e30c72c98e3ef2c1b31ce386be4889549 /scripts | |
| parent | e28c0ab84c7967e10cc3cd5333560c54653084bd (diff) | |
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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/BUILD | 9 |
1 files changed, 2 insertions, 7 deletions
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__"], ) |