Snap for 8962753 from e3f9db205ca72b22d6b128dc5e9c0bb7e37830ab to studio-ee-releasestudio-2022.1.1-rc3studio-2022.1.1-canarystudio-2022.1.1-beta4studio-2022.1.1-beta2studio-2022.1.1studio-canarystudio-2022.1.1-canary

Change-Id: I568546d3db60f91785dd304f41e8b9f74752d2fe

1 files changed, 43 insertions, 15 deletions

diff --git a/jdk17/BUILD b/jdk17/BUILD
index aab952c0..802c62d4 100644
--- a/jdk17/BUILD
+++ b/jdk17/BUILD
@@ -1,16 +1,7 @@
-load("@bazel_tools//tools/jdk:local_java_repository.bzl", "local_java_runtime")
+load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "JDK9_JVM_OPTS", "default_java_toolchain")
 
 package(default_visibility = ["//visibility:public"])
 
-filegroup(
-    name = "jdk17",
-    srcs = ["BUILD"] + select({
-        "@platforms//os:macos": glob(["mac/**"]),
-        "@platforms//os:windows": glob(["win/**"]),
-        "@platforms//os:linux": glob(["linux/**"]),
-    }),
-)
-
 java_runtime(
     name = "jdk17_runtime",
     srcs = select({
@@ -25,11 +16,48 @@ java_runtime(
     }),
 )
 
-local_java_runtime(
-    name = "jdk17",
-    java_home = "",  # java_home is unused; runtime_name is used instead.
-    runtime_name = "jdk17_runtime",
-    version = "17",
+# use jdk17 toolchain when '--java_runtime_version=jbr17' flag is provided
+config_setting(
+    name = "jdk17_name_setting",
+    values = {"java_runtime_version": "jdk17"},
+    visibility = ["//visibility:private"],
+)
+
+toolchain(
+    name = "runtime_toolchain_definition",
+    target_settings = [":jdk17_name_setting"],
+    toolchain = ":jdk17_runtime",
+    toolchain_type = "@bazel_tools//tools/jdk:runtime_toolchain_type",
+)
+
+JDK17_JVM_OPTS = JDK9_JVM_OPTS + [
+    # jdk17 specific options (that would not be applied to jdk11 or jdk21)
+    # for test only options, that are compatible with all jdk please use ./tools/base/bazel/common.bazelrc
+]
+
+default_java_toolchain(
+    name = "jdk17_toolchain_java11",
+    java_runtime = ":jdk17_runtime",
+    jvm_opts = JDK17_JVM_OPTS,
+    source_version = "11",
+    target_version = "11",
+)
+
+default_java_toolchain(
+    name = "jdk17_toolchain_java17",
+    java_runtime = ":jdk17_runtime",
+    jvm_opts = JDK17_JVM_OPTS,
+    source_version = "17",
+    target_version = "17",
+)
+
+filegroup(
+    name = "jdk17_runtime_files",
+    srcs = ["BUILD"] + select({
+        "@platforms//os:macos": glob(["mac/**"]),
+        "@platforms//os:windows": glob(["win/**"]),
+        "@platforms//os:linux": glob(["linux/**"]),
+    }),
 )
 
 filegroup(