Merge ComposingSplitTransition and ComposingPatchTransition.

Part of https://docs.google.com/document/d/1_UJKmAQ9EE8i3Pl0il3YLTYr-Q9EKYYyLatt2zohfyM/edit#

PiperOrigin-RevId: 198420365

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index c02e014353..1aaa58c326 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -38,6 +38,7 @@ import com.google.devtools.build.lib.actions.CommandLines.CommandLineLimits;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.actions.FileWriteAction;
+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.buildeventstream.BuildEventId;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
@@ -1907,8 +1908,8 @@ public class BuildConfiguration implements BuildConfigurationApi {
    * configuration. Returns null if no transition is needed.
    */
   @Nullable
-  public PatchTransition topLevelConfigurationHook(Target toTarget) {
-    PatchTransition currentTransition = null;
+  public ConfigurationTransition topLevelConfigurationHook(Target toTarget) {
+    ConfigurationTransition currentTransition = null;
     for (Fragment fragment : fragments.values()) {
       PatchTransition fragmentTransition = fragment.topLevelConfigurationHook(toTarget);
       if (fragmentTransition == null) {
@@ -1917,7 +1918,7 @@ public class BuildConfiguration implements BuildConfigurationApi {
         currentTransition = fragmentTransition;
       } else {
         currentTransition =
-            TransitionResolver.composePatchTransitions(currentTransition, fragmentTransition);
+            TransitionResolver.composeTransitions(currentTransition, fragmentTransition);
       }
     }
     return currentTransition;