Remove the java_common.java_toolchain_attr field in favor of a java_toolchain_alias() rule, depending on which will accomplish the same thing.

RELNOTES[INC]: java_common.java_toolchain_attr is removed. Depend on the java_toolchain_alias() rule to accomplish the same thing.

PiperOrigin-RevId: 161789578

1 files changed, 4 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
index a9b7685c74..daa14b1942 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -648,12 +648,13 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
         "myrule = rule(",
         "  implementation=_impl,",
         "  fragments = ['java'],",
-        "  attrs = { '_java_toolchain': java_common.java_toolchain_attr }",
+        "  attrs = { '_java_toolchain': attr.label(default=Label('//foo:alias')) }",
         ")"
     );
     scratch.file(
         "foo/BUILD",
         "load(':rule.bzl', 'myrule')",
+        "java_toolchain_alias(name='alias')",
         "myrule(name='myrule')"
     );
     ConfiguredTarget configuredTarget = getConfiguredTarget("//foo:myrule");
@@ -674,12 +675,13 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
         "myrule = rule(",
         "  implementation=_impl,",
         "  fragments = ['java'],",
-        "  attrs = { '_java_toolchain': java_common.java_toolchain_attr }",
+        "  attrs = { '_java_toolchain': attr.label(default=Label('//foo:alias')) }",
         ")"
     );
     scratch.file(
         "foo/BUILD",
         "load(':rule.bzl', 'myrule')",
+        "java_toolchain_alias(name='alias')",
         "myrule(name='myrule')"
     );
     useConfiguration("--java_toolchain=//java/com/google/test:toolchain");