diff options
author | lberki <lberki@google.com> | 2017-07-13 13:20:27 +0200 |
---|---|---|
committer | László Csomor <laszlocsomor@google.com> | 2017-07-14 10:49:44 +0200 |
commit | 34bf0c6e3a7f07679ff29f983c348e2e88a96591 (patch) | |
tree | f381f5c20f0a0d9c64036ef7363fe9bf071a43c7 /src/test/java/com/google/devtools/build/lib/rules | |
parent | 3c1c8e9cb2d73657422c59872c53b55febf5f5d1 (diff) |
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
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java | 6 |
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"); |