diff options
| author |  hlopko <hlopko@google.com> | 2018-06-15 09:10:05 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-15 09:11:41 -0700 |
| commit | 8820d3ae601f229b72c61d2eb601b0e8e9b0111a (patch) | |
| tree | 02caa729cae33cb2414cbda033313705cf0278b9 /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | |
| parent | b36470e6e0073a76012afbed7ba9cf9c32ef002c (diff) | |
Remove LIPO support
RELNOTES: Support for LIPO has been fully removed.
PiperOrigin-RevId: 200724578
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 15 |
1 files changed, 4 insertions, 11 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 ac6e8d1496..f024250102 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 @@ -78,7 +78,6 @@ 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.configuredtargets.MergedConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget.DuplicateException; import com.google.devtools.build.lib.cmdline.Label; @@ -1214,19 +1213,13 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { List<BuildConfiguration> topLevelTargetConfigs = getConfigurations(eventHandler, getTopLevelBuildOptions(buildOptions, multiCpu), keepGoing); - // The host configuration inherits the data, not target options. This is so host tools don't - // apply LIPO. BuildConfiguration firstTargetConfig = topLevelTargetConfigs.get(0); - ConfigurationTransition dataTransition = - ((ConfiguredRuleClassProvider) ruleClassProvider).getLipoDataTransition(); - BuildOptions dataOptions = dataTransition != NoTransition.INSTANCE - ? ((PatchTransition) dataTransition).patch(firstTargetConfig.getOptions()) - : firstTargetConfig.getOptions(); + BuildOptions targetOptions = firstTargetConfig.getOptions(); BuildOptions hostOptions = - dataOptions.get(BuildConfiguration.Options.class).useDistinctHostConfiguration - ? HostTransition.INSTANCE.patch(dataOptions) - : dataOptions; + targetOptions.get(BuildConfiguration.Options.class).useDistinctHostConfiguration + ? HostTransition.INSTANCE.patch(targetOptions) + : targetOptions; BuildConfiguration hostConfig = getConfiguration(eventHandler, hostOptions, keepGoing); // TODO(gregce): cache invalid option errors in BuildConfigurationFunction, then use a dedicated |