Remove Attribute.hasHostConfigurationTransition.
Part of #7814.
PiperOrigin-RevId: 241576383
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/constraints/ConstraintSemantics.java b/src/main/java/com/google/devtools/build/lib/analysis/constraints/ConstraintSemantics.java
index c6deba0..592d587 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/constraints/ConstraintSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/constraints/ConstraintSemantics.java
@@ -852,7 +852,7 @@
if (!DependencyFilter.NO_IMPLICIT_DEPS.apply(ruleContext.getRule(), attrDef)
// We can't identify host deps by calling BuildConfiguration.isHostConfiguration()
// because --nodistinct_host_configuration subverts that call.
- || attrDef.hasHostConfigurationTransition()) {
+ || attrDef.getTransitionFactory().isHost()) {
continue;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index 1d5a0b1..917630a 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -2150,15 +2150,6 @@
}
/**
- * Returns true if this attribute transitions to the host configuration. See {@link
- * com.google.devtools.build.lib.analysis.config.HostTransition}.
- */
- // TODO(https://github.com/bazelbuild/bazel/issues/7814) Remove this.
- public boolean hasHostConfigurationTransition() {
- return transitionFactory.isHost();
- }
-
- /**
* Returns whether the target is required to be executable for label or label
* list attributes. For other attributes it always returns {@code false}.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/packages/DependencyFilter.java b/src/main/java/com/google/devtools/build/lib/packages/DependencyFilter.java
index 71b451f..0bce1a6 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/DependencyFilter.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/DependencyFilter.java
@@ -43,7 +43,7 @@
return true;
}
- return !attribute.hasHostConfigurationTransition();
+ return !attribute.getTransitionFactory().isHost();
}
};
/** Dependency predicate that excludes implicit dependencies */
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
index 82fe31a..ddd8a43 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
@@ -650,7 +650,7 @@
attrPb.setAllowEmpty(!attr.isNonEmpty());
attrPb.setAllowSingleFile(attr.isSingleArtifact());
attrPb.setConfigurable(attr.isConfigurable());
- attrPb.setCfgIsHost(attr.hasHostConfigurationTransition());
+ attrPb.setCfgIsHost(attr.getTransitionFactory().isHost());
// Encode default value, if simple.
Object v = attr.getDefaultValueUnchecked();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapperTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapperTest.java
index 71561f4..eea7ba4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapperTest.java
@@ -183,7 +183,8 @@
.getAssociatedRule()
.getRuleClassObject()
.getAttributeByName("tools")
- .hasHostConfigurationTransition())
+ .getTransitionFactory()
+ .isHost())
.isTrue();
assertThat(getHostConfiguration().getCompilationMode()).isEqualTo(CompilationMode.OPT);
}
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 6353b8a..890e743 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
@@ -304,7 +304,7 @@
public void testHostTransition() throws Exception {
Attribute attr =
attr("foo", LABEL).cfg(HostTransition.createFactory()).allowedFileTypes().build();
- assertThat(attr.hasHostConfigurationTransition()).isTrue();
+ assertThat(attr.getTransitionFactory().isHost()).isTrue();
assertThat(attr.getTransitionFactory().isSplit()).isFalse();
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 325bc83..005d025 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -581,7 +581,7 @@
@Test
public void testAttrCfg() throws Exception {
Attribute attr = buildAttribute("a1", "attr.label(cfg = 'host', allow_files = True)");
- assertThat(attr.hasHostConfigurationTransition()).isTrue();
+ assertThat(attr.getTransitionFactory().isHost()).isTrue();
}
@Test
