Replace Attribute.ConfigurationTransition with config.transitions.ConfigurationTransitionProxy.

The "proxy" part is to dissuade people from writing:

 void myfunc(ConfigurationTransition transition)

signatures casually.

Maybe that's actually a better name than "Transition". But I'd rather
rename Transition to ConfigurationTransition in its own change if we
want to do that.

PiperOrigin-RevId: 180285321

1 files changed, 6 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index 35ed29b55b..aec52e1233 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -14,7 +14,7 @@
 
 package com.google.devtools.build.lib.analysis;
 
-import static com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition.DATA;
+import static com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransitionProxy.DATA;
 import static com.google.devtools.build.lib.packages.Attribute.attr;
 import static com.google.devtools.build.lib.packages.BuildType.DISTRIBUTIONS;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL;
@@ -35,6 +35,7 @@ import com.google.devtools.build.lib.analysis.config.DynamicTransitionMapper;
 import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.analysis.config.PatchTransition;
 import com.google.devtools.build.lib.analysis.config.RunUnder;
+import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransitionProxy;
 import com.google.devtools.build.lib.analysis.config.transitions.Transition;
 import com.google.devtools.build.lib.analysis.constraints.EnvironmentRule;
 import com.google.devtools.build.lib.analysis.test.TestConfiguration;
@@ -393,7 +394,7 @@ public class BaseRuleClasses {
   }
 
   /**
-   * Declares the implementations for {@link Attribute.ConfigurationTransition} enums.
+   * Declares the implementations for {@link ConfigurationTransitionProxy} enums.
    *
    * <p>We can't put this in {@link Attribute} because that's in the {@code lib.packages} package,
    * which has no access to configuration classes.
@@ -402,9 +403,9 @@ public class BaseRuleClasses {
    */
   public static final ImmutableMap<Transition, Transition> DYNAMIC_TRANSITIONS_MAP =
       ImmutableMap.of(
-          Attribute.ConfigurationTransition.NONE, DynamicTransitionMapper.SELF,
-          Attribute.ConfigurationTransition.NULL, DynamicTransitionMapper.SELF
-          // Attribute.ConfigurationTransition.DATA is skipped because it's C++-specific.
+          ConfigurationTransitionProxy.NONE, DynamicTransitionMapper.SELF,
+          ConfigurationTransitionProxy.NULL, DynamicTransitionMapper.SELF
+          // ConfigurationTransitionProxy.DATA is skipped because it's C++-specific.
           // The C++ rule definitions handle its mapping.
       );
 }