Update all attributes which use the host transition to use the host transition
factory.
This will help ensure that calls to TransitionFactory.isHost will always be
correct.
Part of #7814.
PiperOrigin-RevId: 240977747
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index b0f440a..a26e17f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -493,7 +493,7 @@
.aspect(AspectThatRegistersAction.INSTANCE))
.add(
attr(":action_listener", LABEL_LIST)
- .cfg(HostTransition.INSTANCE)
+ .cfg(HostTransition.createFactory())
.value(ACTION_LISTENER)));
public static class AspectThatRegistersAction extends NativeAspectClass
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/test/TestTrimmingTransitionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/test/TestTrimmingTransitionTest.java
index 7ba5f6e..ab7de92 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/test/TestTrimmingTransitionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/test/TestTrimmingTransitionTest.java
@@ -83,7 +83,7 @@
"native_test",
attr("deps", LABEL_LIST).allowedFileTypes(),
attr("host_deps", LABEL_LIST)
- .cfg(HostTransition.INSTANCE)
+ .cfg(HostTransition.createFactory())
.allowedFileTypes());
private static final RuleDefinition NATIVE_LIB_RULE =
@@ -94,7 +94,7 @@
"native_lib",
attr("deps", LABEL_LIST).allowedFileTypes(),
attr("host_deps", LABEL_LIST)
- .cfg(HostTransition.INSTANCE)
+ .cfg(HostTransition.createFactory())
.allowedFileTypes());
@Before
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/MockRuleDefaults.java b/src/test/java/com/google/devtools/build/lib/analysis/util/MockRuleDefaults.java
index c38eea0..c2cb9e1 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/MockRuleDefaults.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/MockRuleDefaults.java
@@ -63,7 +63,7 @@
attr("tags", STRING_LIST).nonconfigurable("test"),
attr("visibility", NODEP_LABEL_LIST)
.orderIndependent()
- .cfg(HostTransition.INSTANCE)
+ .cfg(HostTransition.createFactory())
.nonconfigurable("test"),
attr(RuleClass.COMPATIBLE_ENVIRONMENT_ATTR, LABEL_LIST)
.allowedFileTypes(FileTypeSet.NO_FILE)
diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
index 2211e573..b0320d2 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
@@ -98,10 +98,12 @@
@Test
public void testDoublePropertySet() {
- Attribute.Builder<String> builder = attr("x", STRING).mandatory()
- .cfg(HostTransition.INSTANCE)
- .undocumented("")
- .value("y");
+ Attribute.Builder<String> builder =
+ attr("x", STRING)
+ .mandatory()
+ .cfg(HostTransition.createFactory())
+ .undocumented("")
+ .value("y");
try {
builder.mandatory();
fail();
@@ -109,7 +111,7 @@
// expected
}
try {
- builder.cfg(HostTransition.INSTANCE);
+ builder.cfg(HostTransition.createFactory());
fail();
} catch (IllegalStateException expected) {
// expected
@@ -298,7 +300,8 @@
@Test
public void testHostTransition() throws Exception {
- Attribute attr = attr("foo", LABEL).cfg(HostTransition.INSTANCE).allowedFileTypes().build();
+ Attribute attr =
+ attr("foo", LABEL).cfg(HostTransition.createFactory()).allowedFileTypes().build();
assertThat(attr.hasHostConfigurationTransition()).isTrue();
assertThat(attr.hasSplitConfigurationTransition()).isFalse();
}
diff --git a/src/test/java/com/google/devtools/build/lib/query2/engine/ConfiguredTargetQueryTest.java b/src/test/java/com/google/devtools/build/lib/query2/engine/ConfiguredTargetQueryTest.java
index d8c9ad8..0432f54 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/engine/ConfiguredTargetQueryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/engine/ConfiguredTargetQueryTest.java
@@ -194,7 +194,7 @@
"rule_with_host_dep",
attr("host_dep", LABEL)
.allowedFileTypes(FileTypeSet.ANY_FILE)
- .cfg(HostTransition.INSTANCE),
+ .cfg(HostTransition.createFactory()),
attr("$impl_dep", LABEL)
.allowedFileTypes(FileTypeSet.ANY_FILE)
.value(Label.parseAbsoluteUnchecked("//test:other")));
@@ -269,7 +269,7 @@
attr("target", LABEL).allowedFileTypes(FileTypeSet.ANY_FILE),
attr("host", LABEL)
.allowedFileTypes(FileTypeSet.ANY_FILE)
- .cfg(HostTransition.INSTANCE),
+ .cfg(HostTransition.createFactory()),
attr("deps", BuildType.LABEL_LIST).allowedFileTypes(FileTypeSet.ANY_FILE));
MockRule simpleRule =
() ->
