LSC(tp): Add `load()` statements for the builtin top-level java symbols BEGIN_PUBLIC Add `load()` statements for the Bazel builtin top-level java symbols Loads are being added in preparation for moving the symbols out of Bazel and into `rules_java`. END_PUBLIC PiperOrigin-RevId: 624086461 Change-Id: If4709ce9573d48ef78a2534c5fef1574aa093baa
diff --git a/java/BUILD b/java/BUILD index 53bd9dd..ecce826 100644 --- a/java/BUILD +++ b/java/BUILD
@@ -37,7 +37,10 @@ "java_test.bzl", ], visibility = ["//visibility:public"], - deps = ["//java/private"], + deps = [ + "//java/common", + "//java/private", + ], ) bzl_library( @@ -50,6 +53,7 @@ name = "java_single_jar", srcs = ["java_single_jar.bzl"], visibility = ["//visibility:public"], + deps = ["//java/common"], ) filegroup(
diff --git a/java/java_single_jar.bzl b/java/java_single_jar.bzl index 679c069..6e85bde 100644 --- a/java/java_single_jar.bzl +++ b/java/java_single_jar.bzl
@@ -1,5 +1,8 @@ """ Definition of _java_single_jar. """ +load("//java/common:java_common.bzl", "java_common") +load("//java/common:java_info.bzl", "JavaInfo") + def _java_single_jar(ctx): transitive_inputs = [] for dep in ctx.attr.deps:
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl index 721192d..020b101 100644 --- a/toolchains/default_java_toolchain.bzl +++ b/toolchains/default_java_toolchain.bzl
@@ -15,6 +15,7 @@ """Rules for defining default_java_toolchain""" load("//java:defs.bzl", "java_toolchain") +load("//java/common:java_common.bzl", "java_common") # JVM options, without patching java.compiler and jdk.compiler modules. BASE_JDK9_JVM_OPTS = [
diff --git a/toolchains/java_toolchain_alias.bzl b/toolchains/java_toolchain_alias.bzl index a63c70e..8d8a7e4 100644 --- a/toolchains/java_toolchain_alias.bzl +++ b/toolchains/java_toolchain_alias.bzl
@@ -14,6 +14,8 @@ """Experimental re-implementations of Java toolchain aliases using toolchain resolution.""" +load("//java/common:java_common.bzl", "java_common") + def _java_runtime_alias(ctx): """An experimental implementation of java_runtime_alias using toolchain resolution.""" toolchain_info = ctx.toolchains["@bazel_tools//tools/jdk:runtime_toolchain_type"]
diff --git a/toolchains/toolchain_utils.bzl b/toolchains/toolchain_utils.bzl index 7177092..8a33293 100644 --- a/toolchains/toolchain_utils.bzl +++ b/toolchains/toolchain_utils.bzl
@@ -19,6 +19,8 @@ legacy toolchain selection. """ +load("//java/common:java_common.bzl", "java_common") + def find_java_toolchain(ctx, target): """ Finds the Java toolchain.