From 860975ab5e21078bee9009049031b9c72508f2cf Mon Sep 17 00:00:00 2001 From: mstaib Date: Thu, 26 Apr 2018 15:00:52 -0700 Subject: Replace ConfigurationTransition with PatchTransition in a few places. RELNOTES: None. PiperOrigin-RevId: 194459347 --- .../lib/analysis/config/ComposingRuleTransitionFactory.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java') 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 e56f03672e..ca23d24e9f 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 @@ -17,7 +17,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.ConfigurationTransition; 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; @@ -41,11 +40,9 @@ public class ComposingRuleTransitionFactory implements RuleTransitionFactory { } @Override - public ConfigurationTransition buildTransitionFor(Rule rule) { - PatchTransition transition1 = - (PatchTransition) Preconditions.checkNotNull(rtf1.buildTransitionFor(rule)); - PatchTransition transition2 = - (PatchTransition) Preconditions.checkNotNull(rtf2.buildTransitionFor(rule)); + 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; -- cgit v1.2.3