From bf429fae58c8d01f0e27e5403a7527707d50f0d9 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Thu, 11 Nov 2021 12:27:07 +0100 Subject: [PATCH] Also define local_jdk_repo in rules_java_dependencies --- java/repositories.bzl | 8 +++----- toolchains/local_java_repository.bzl | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/java/repositories.bzl b/java/repositories.bzl index 17a2343..7a49a4e 100644 --- a/java/repositories.bzl +++ b/java/repositories.bzl @@ -65,10 +65,9 @@ def java_tools_javac11_repos(): ], ) -def local_jdk_repo(default_system_javabase = None): +def local_jdk_repo(): local_java_repository( name = "local_jdk", - java_home = default_system_javabase, build_file = Label("//toolchains:jdk.BUILD"), ) @@ -385,8 +384,7 @@ def rules_java_dependencies(): Loads the remote repositories used by default in Bazel. """ - # TODO: pass DEFAULT_SYSTEM_JAVABASE to local_jdk_repo - # local_jdk_repo() + local_jdk_repo() remote_jdk11_repos() remote_jdk15_repos() remote_jdk16_repos() @@ -414,6 +412,6 @@ def rules_java_toolchains(name = "toolchains"): REMOTE_JDK_REPOS = [("remotejdk" + version + "_" + platform) for version in JDK_VERSIONS for platform in PLATFORMS] + EXTRA_REMOTE_JDK11_REPOS native.register_toolchains("//toolchains:all") - # native.register_toolchains("@local_jdk//:runtime_toolchain_definition") + native.register_toolchains("@local_jdk//:runtime_toolchain_definition") for name in REMOTE_JDK_REPOS: native.register_toolchains("@" + name + "_toolchain_config_repo//:toolchain") diff --git a/toolchains/local_java_repository.bzl b/toolchains/local_java_repository.bzl index 1d2b45b..b0ac14a 100644 --- a/toolchains/local_java_repository.bzl +++ b/toolchains/local_java_repository.bzl @@ -257,7 +257,7 @@ _local_java_repository_rule = repository_rule( }, ) -def local_java_repository(name, java_home, version = "", build_file = None): +def local_java_repository(name, java_home = "", version = "", build_file = None): """Registers a runtime toolchain for local JDK and creates an unregistered compile toolchain. Toolchain resolution is constrained with --java_runtime_version flag