Remove final accessors of ConfigurationTransition.HOST.

Also lean interfaces from Attribute.ConfigurationTransition
to Attribute.Transition.

PiperOrigin-RevId: 179846158

3 files changed, 19 insertions, 16 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
index 5127120ab0..a15300cbce 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
@@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.ConfigAwareAspectBuilder;
+import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.AdvertisedProviderSet;
 import com.google.devtools.build.lib.packages.AspectDefinition;
@@ -298,7 +299,7 @@ public class AspectDefinitionTest {
     assertThat(requiresFragments.getConfigurationFragmentPolicy()).isNotNull();
     assertThat(
         requiresFragments.getConfigurationFragmentPolicy()
-            .isLegalConfigurationFragment(TestFragment.class, ConfigurationTransition.HOST))
+            .isLegalConfigurationFragment(TestFragment.class, HostTransition.INSTANCE))
         .isTrue();
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DependencyTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DependencyTest.java
index df6541a461..a8f8e97dec 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/DependencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/DependencyTest.java
@@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.NullPointerTester;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
+import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
 import com.google.devtools.build.lib.analysis.util.TestAspects;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -179,13 +180,13 @@ public class DependencyTest extends AnalysisTestCase {
         ImmutableSet.of(simpleAspect, attributeAspect));
     Dependency hostDep =
         Dependency.withTransitionAndAspects(
-            Label.parseAbsolute("//a"), ConfigurationTransition.HOST, twoAspects);
+            Label.parseAbsolute("//a"), HostTransition.INSTANCE, twoAspects);
 
     assertThat(hostDep.getLabel()).isEqualTo(Label.parseAbsolute("//a"));
     assertThat(hostDep.hasExplicitConfiguration()).isFalse();
     assertThat(hostDep.getAspects().getAllAspects())
         .containsExactlyElementsIn(twoAspects.getAllAspects());
-    assertThat(hostDep.getTransition()).isEqualTo(ConfigurationTransition.HOST);
+    assertThat(hostDep.getTransition().isHostTransition()).isTrue();
 
     try {
       hostDep.getConfiguration();
@@ -216,7 +217,7 @@ public class DependencyTest extends AnalysisTestCase {
     update();
     Dependency dep =
         Dependency.withTransitionAndAspects(
-            Label.parseAbsolute("//a"), ConfigurationTransition.HOST,
+            Label.parseAbsolute("//a"), HostTransition.INSTANCE,
             AspectCollection.EMPTY);
     // Here we're also checking that this doesn't throw an exception. No boom? OK. Good.
     assertThat(dep.getAspects().getAllAspects()).isEmpty();
@@ -355,25 +356,25 @@ public class DependencyTest extends AnalysisTestCase {
             Dependency.withConfiguredAspects(b, target, noAspects, noAspectsMap))
         .addEqualityGroup(
             // base set but with transition HOST
-            Dependency.withTransitionAndAspects(a, ConfigurationTransition.HOST, twoAspects),
+            Dependency.withTransitionAndAspects(a, HostTransition.INSTANCE, twoAspects),
             Dependency.withTransitionAndAspects(
-                aExplicit, ConfigurationTransition.HOST, twoAspects),
-            Dependency.withTransitionAndAspects(a, ConfigurationTransition.HOST, inverseAspects),
+                aExplicit, HostTransition.INSTANCE, twoAspects),
+            Dependency.withTransitionAndAspects(a, HostTransition.INSTANCE, inverseAspects),
             Dependency.withTransitionAndAspects(
-                aExplicit, ConfigurationTransition.HOST, inverseAspects))
+                aExplicit, HostTransition.INSTANCE, inverseAspects))
         .addEqualityGroup(
             // base set but with transition HOST and different aspects
-            Dependency.withTransitionAndAspects(a, ConfigurationTransition.HOST, differentAspects),
+            Dependency.withTransitionAndAspects(a, HostTransition.INSTANCE, differentAspects),
             Dependency.withTransitionAndAspects(
-                aExplicit, ConfigurationTransition.HOST, differentAspects))
+                aExplicit, HostTransition.INSTANCE, differentAspects))
         .addEqualityGroup(
             // base set but with transition HOST and label //b
-            Dependency.withTransitionAndAspects(b, ConfigurationTransition.HOST, twoAspects),
-            Dependency.withTransitionAndAspects(b, ConfigurationTransition.HOST, inverseAspects))
+            Dependency.withTransitionAndAspects(b, HostTransition.INSTANCE, twoAspects),
+            Dependency.withTransitionAndAspects(b, HostTransition.INSTANCE, inverseAspects))
         .addEqualityGroup(
             // inverse of base set: transition HOST, label //b, different aspects
-            Dependency.withTransitionAndAspects(b, ConfigurationTransition.HOST, differentAspects),
-            Dependency.withTransitionAndAspects(b, ConfigurationTransition.HOST, differentAspects))
+            Dependency.withTransitionAndAspects(b, HostTransition.INSTANCE, differentAspects),
+            Dependency.withTransitionAndAspects(b, HostTransition.INSTANCE, differentAspects))
         .addEqualityGroup(
             // base set but with transition NONE
             Dependency.withTransitionAndAspects(a, ConfigurationTransition.NONE, twoAspects),
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
index a5353e1df2..832299702b 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
@@ -27,6 +27,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredAspect;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.OutputGroupInfo;
 import com.google.devtools.build.lib.analysis.ViewCreationFailedException;
+import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.TargetParsingException;
@@ -215,7 +216,7 @@ public class SkylarkDefinedAspectsTest extends AnalysisTestCase {
         .isTrue();
     assertThat(
         aspectDefinition.getConfigurationFragmentPolicy()
-            .isLegalConfigurationFragment(Jvm.class, ConfigurationTransition.HOST))
+            .isLegalConfigurationFragment(Jvm.class, HostTransition.INSTANCE))
         .isFalse();
     assertThat(
         aspectDefinition.getConfigurationFragmentPolicy()
@@ -223,7 +224,7 @@ public class SkylarkDefinedAspectsTest extends AnalysisTestCase {
         .isFalse();
     assertThat(
         aspectDefinition.getConfigurationFragmentPolicy()
-            .isLegalConfigurationFragment(CppConfiguration.class, ConfigurationTransition.HOST))
+            .isLegalConfigurationFragment(CppConfiguration.class, HostTransition.INSTANCE))
         .isTrue();
   }