commit 860975ab5e21078bee9009049031b9c72508f2cf
author mstaib <mstaib@google.com> Thu Apr 26 15:00:52 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu Apr 26 15:02:34 2018 -0700
tree 0b036cab6f38ffd70d95d3cffab9fd4ce9b1f3a6
parent ac21f64853475d52bd34140d2f459894ac0d437f

Replace ConfigurationTransition with PatchTransition in a few places.

RELNOTES: None.
PiperOrigin-RevId: 194459347

src/main/java/com/google/devtools/build/lib/packages/RuleClass.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index 4795e61..d423ea2 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -31,6 +31,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition;
+import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
@@ -553,15 +554,15 @@
     @AutoCodec.VisibleForSerialization
     @AutoCodec
     static final class FixedTransitionFactory implements RuleTransitionFactory {
-      private final ConfigurationTransition transition;
+      private final PatchTransition transition;
 
       @AutoCodec.VisibleForSerialization
-      FixedTransitionFactory(ConfigurationTransition transition) {
+      FixedTransitionFactory(PatchTransition transition) {
         this.transition = transition;
       }
 
       @Override
-      public ConfigurationTransition buildTransitionFor(Rule rule) {
+      public PatchTransition buildTransitionFor(Rule rule) {
         return transition;
       }
     }
@@ -895,13 +896,10 @@
     /**
      * Applies the given transition to all incoming edges for this rule class.
      *
-     * <p>The given transition must be a PatchTransition.  We use the more general Transition
-     * here because PatchTransition is not available in this package.
-     *
      * <p>If you need the transition to depend on the rule it's being applied to, use
      * {@link #cfg(RuleTransitionFactory)}.
      */
-    public Builder cfg(ConfigurationTransition transition) {
+    public Builder cfg(PatchTransition transition) {
       Preconditions.checkState(type != RuleClassType.ABSTRACT,
           "Setting not inherited property (cfg) of abstract rule class '%s'", name);
       Preconditions.checkState(this.transitionFactory == null,