1 files changed, 2 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java
index ca23d24e9f..ec8cfc35f6 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java
@@ -15,9 +15,6 @@
 
 package com.google.devtools.build.lib.analysis.config;
 
-import com.google.common.base.Preconditions;
-import com.google.devtools.build.lib.analysis.config.transitions.ComposingPatchTransition;
-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.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleTransitionFactory;
@@ -41,17 +38,7 @@ public class ComposingRuleTransitionFactory implements RuleTransitionFactory {
 
   @Override
   public PatchTransition buildTransitionFor(Rule rule) {
-    PatchTransition transition1 = Preconditions.checkNotNull(rtf1.buildTransitionFor(rule));
-    PatchTransition transition2 = Preconditions.checkNotNull(rtf2.buildTransitionFor(rule));
-
-    if (transition1 == NoTransition.INSTANCE) {
-      return transition2;
-    }
-
-    if (transition2 == NoTransition.INSTANCE) {
-      return transition1;
-    }
-
-    return new ComposingPatchTransition(transition1, transition2);
+    return TransitionResolver.composePatchTransitions(
+        rtf1.buildTransitionFor(rule), rtf2.buildTransitionFor(rule));
   }
 }