From 75a294bc20878ece2b45359a9c06db644744112f Mon Sep 17 00:00:00 2001 From: Wolf Date: Wed, 20 Jul 2022 02:00:52 +0200 Subject: [PATCH 2/4] Prefer local_jdk instead of remote_jdk11 --- .../devtools/build/lib/rules/java/JavaOptions.java | 2 +- tools/jdk/BUILD.tools | 2 +- tools/jdk/default_java_toolchain.bzl | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java index 7794ef22c1..693f640131 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java @@ -511,7 +511,7 @@ public class JavaOptions extends FragmentOptions { @Option( name = "tool_java_runtime_version", - defaultValue = "remotejdk_11", + defaultValue = "local_jdk", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "The Java runtime version used to execute tools during the build") diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools index 7586fc22de..8edd0f9619 100644 --- a/tools/jdk/BUILD.tools +++ b/tools/jdk/BUILD.tools @@ -328,7 +328,7 @@ alias( alias( name = "host_jdk", - actual = ":remote_jdk11", + actual = "@local_jdk//:jdk", ) bootclasspath( diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl index af3a646a44..da137ed26d 100644 --- a/tools/jdk/default_java_toolchain.bzl +++ b/tools/jdk/default_java_toolchain.bzl @@ -98,7 +98,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = dict( "@remote_java_tools//:java_compiler_jar", "@remote_java_tools//:jdk_compiler_jar", ], - java_runtime = "@bazel_tools//tools/jdk:remote_jdk11", + java_runtime = "@local_jdk//:jdk", ) # The 'vanilla' toolchain is an unsupported alternative to the default. @@ -137,9 +137,9 @@ PREBUILT_TOOLCHAIN_CONFIGURATION = dict( "@remote_java_tools//:java_compiler_jar", "@remote_java_tools//:jdk_compiler_jar", ], - ijar = ["@bazel_tools//tools/jdk:ijar_prebuilt_binary"], - singlejar = ["@bazel_tools//tools/jdk:prebuilt_singlejar"], - java_runtime = "@bazel_tools//tools/jdk:remote_jdk11", + ijar = ["@remote_java_tools//:ijar_cc_binary"], + singlejar = ["@remote_java_tools//:singlejar_cc_bin"], + java_runtime = "@local_jdk//:jdk", ) # The new toolchain is using all the tools from sources. @@ -158,7 +158,7 @@ NONPREBUILT_TOOLCHAIN_CONFIGURATION = dict( ], ijar = ["@remote_java_tools//:ijar_cc_binary"], singlejar = ["@remote_java_tools//:singlejar_cc_bin"], - java_runtime = "@bazel_tools//tools/jdk:remote_jdk11", + java_runtime = "@local_jdk//:jdk", ) def default_java_toolchain(name, configuration = DEFAULT_TOOLCHAIN_CONFIGURATION, toolchain_definition = True, **kwargs): -- 2.36.2