commit 7fa23eaf4617431875acbb63052f7349546343ba
author gregce <gregce@google.com> Thu Jan 18 12:46:04 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Thu Jan 18 12:48:05 2018 -0800
tree 6b77ab236733751b62c29d92069e4eab0a6dc216
parent 56567bbb56ab2f0d1423121abea4af2373acc8aa

Remove ConfigurationTransitionProxy.NONE and BaseRuleClasses.DYNAMIC_TRANSITION_MAP.

This leaves DATA as the last remaining legacy transition.

PiperOrigin-RevId: 182422552

src/main/java/com/google/devtools/build/lib/analysis/BuildView.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 95ea703..5097f42 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -45,7 +45,7 @@
 import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider;
 import com.google.devtools.build.lib.analysis.config.ConfigurationResolver;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
-import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransitionProxy;
+import com.google.devtools.build.lib.analysis.config.transitions.NoTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.Transition;
 import com.google.devtools.build.lib.analysis.constraints.TopLevelConstraintSemantics;
@@ -957,7 +957,7 @@
           Iterable<BuildOptions> buildOptions) {
         Preconditions.checkArgument(ct.getConfiguration().fragmentClasses().equals(fragments));
         Dependency asDep = Dependency.withTransitionAndAspects(ct.getLabel(),
-            ConfigurationTransitionProxy.NONE, AspectCollection.EMPTY);
+            NoTransition.INSTANCE, AspectCollection.EMPTY);
         ImmutableList.Builder<BuildConfiguration> builder = ImmutableList.builder();
         for (BuildOptions options : buildOptions) {
           builder.add(Iterables.getOnlyElement(
@@ -1036,19 +1036,19 @@
           .getTarget(handler, label)
           .getAssociatedRule();
     } catch (NoSuchPackageException | NoSuchTargetException e) {
-      return ConfigurationTransitionProxy.NONE;
+      return NoTransition.INSTANCE;
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
       throw new AssertionError("Configuration of " + label + " interrupted");
     }
     if (rule == null) {
-      return ConfigurationTransitionProxy.NONE;
+      return NoTransition.INSTANCE;
     }
     RuleTransitionFactory factory = rule
         .getRuleClassObject()
         .getTransitionFactory();
     if (factory == null) {
-      return ConfigurationTransitionProxy.NONE;
+      return NoTransition.INSTANCE;
     }
 
     // dynamicTransitionMapper is only needed because of ConfigurationTransitionProxy.DATA:
@@ -1056,7 +1056,7 @@
     // C++-specific patch transition that implements it.
     PatchTransition transition = (PatchTransition)
         ruleClassProvider.getDynamicTransitionMapper().map(factory.buildTransitionFor(rule));
-    return (transition == null) ? ConfigurationTransitionProxy.NONE : transition;
+    return (transition == null) ? NoTransition.INSTANCE : transition;
   }
 
   /**