diff options
| author |  gregce <gregce@google.com> | 2018-01-30 11:04:53 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-30 11:06:58 -0800 |
| commit | be55e1181fd49ef78c24255f66f8d26882730af1 (patch) | |
| tree | 606dadfa48c2f3b0065da45d20c382f8ddc1f590 /src/main/java/com/google/devtools/build/lib/skyframe | |
| parent | 34c9b65a873dd9b79bafe3202571e6de81af1b50 (diff) | |
Rename Transition to ConfigurationTransition.
PiperOrigin-RevId: 183859414
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index 7c123ff3a0..7ae5ac59e7 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -74,9 +74,9 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationResolver; import com.google.devtools.build.lib.analysis.config.FragmentClassSet; import com.google.devtools.build.lib.analysis.config.HostTransition; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; +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.analysis.config.transitions.Transition; import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget.DuplicateException; import com.google.devtools.build.lib.cmdline.Label; @@ -1132,7 +1132,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { // The host configuration inherits the data, not target options. This is so host tools don't // apply LIPO. BuildConfiguration firstTargetConfig = topLevelTargetConfigs.get(0); - Transition dataTransition = + ConfigurationTransition dataTransition = ((ConfiguredRuleClassProvider) ruleClassProvider).getLipoDataTransition(); BuildOptions dataOptions = dataTransition != NoTransition.INSTANCE ? ((PatchTransition) dataTransition).apply(firstTargetConfig.getOptions()) @@ -1649,7 +1649,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { ExtendedEventHandler eventHandler, Label label, BuildConfiguration configuration, - Transition transition) { + ConfigurationTransition transition) { ConfiguredTargetAndTarget configuredTargetAndTarget = Iterables.getFirst( getConfiguredTargetsForTesting( |