diff options
author | John Cater <jcater@google.com> | 2018-01-04 11:52:21 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-04 11:53:59 -0800 |
commit | ec5d2edb3f6aa82f3a551f26bc7d0e97a77398ef (patch) | |
tree | c0934e400599bc7e27195002b7f76ad87f553f92 /src/main/java/com/google/devtools/build/lib/analysis | |
parent | 260756dcd176ce1e9a90454458eddf20ce4e664f (diff) |
Fix Action subclasses so that the execution platform is properly set in
more cases.
Part of #4128.
Change-Id: Ife5e4581f91ac07931d193ed5eaa256aab3ad047
PiperOrigin-RevId: 180826445
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
3 files changed, 10 insertions, 31 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java index 25a0cf3381..9f06d5ce96 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java @@ -381,7 +381,8 @@ public final class RuleContext extends TargetContext @Override public ActionOwner getActionOwner() { if (actionOwner == null) { - actionOwner = createActionOwner(rule, aspectDescriptors, getConfiguration()); + actionOwner = + createActionOwner(rule, aspectDescriptors, getConfiguration(), getExecutionPlatform()); } return actionOwner; } @@ -461,7 +462,8 @@ public final class RuleContext extends TargetContext public static ActionOwner createActionOwner( Rule rule, ImmutableList<AspectDescriptor> aspectDescriptors, - BuildConfiguration configuration) { + BuildConfiguration configuration, + @Nullable PlatformInfo executionPlatform) { return ActionOwner.create( rule.getLabel(), aspectDescriptors, @@ -470,7 +472,8 @@ public final class RuleContext extends TargetContext rule.getTargetKind(), configuration.checksum(), configuration, - configuration.isHostConfiguration() ? HOST_CONFIGURATION_PROGRESS_TAG : null); + configuration.isHostConfiguration() ? HOST_CONFIGURATION_PROGRESS_TAG : null, + executionPlatform); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index edb6aab5c1..74bd33a0d6 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -55,7 +55,6 @@ import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.FilesToRunProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; -import com.google.devtools.build.lib.analysis.platform.PlatformInfo; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.NestedSetView; @@ -110,8 +109,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie private final ExtraActionInfoSupplier<?> extraActionInfoSupplier; - @Nullable private final PlatformInfo executionPlatform; - /** * Constructs a SpawnAction using direct initialization arguments. * @@ -157,7 +154,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie EmptyRunfilesSupplier.INSTANCE, mnemonic, false, - null, null); } @@ -199,8 +195,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie RunfilesSupplier runfilesSupplier, String mnemonic, boolean executeUnconditionally, - ExtraActionInfoSupplier<?> extraActionInfoSupplier, - @Nullable PlatformInfo executionPlatform) { + ExtraActionInfoSupplier<?> extraActionInfoSupplier) { super(owner, tools, inputs, runfilesSupplier, outputs, env); this.resourceSet = resourceSet; this.executionInfo = executionInfo; @@ -210,7 +205,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie this.mnemonic = mnemonic; this.executeUnconditionally = executeUnconditionally; this.extraActionInfoSupplier = extraActionInfoSupplier; - this.executionPlatform = executionPlatform; } @Override @@ -466,12 +460,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie return actionExecutionContext.getSpawnActionContext(getMnemonic()); } - @Override - @Nullable - public PlatformInfo getExecutionPlatform() { - return executionPlatform; - } - /** * A spawn instance that is tied to a specific SpawnAction. */ @@ -623,7 +611,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie private String mnemonic = "Unknown"; protected ExtraActionInfoSupplier<?> extraActionInfoSupplier = null; private boolean disableSandboxing = false; - @Nullable private PlatformInfo executionPlatform; /** * Creates a SpawnAction builder. @@ -651,7 +638,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie this.commandLines = Lists.newArrayList(other.commandLines); this.progressMessage = other.progressMessage; this.mnemonic = other.mnemonic; - this.executionPlatform = other.executionPlatform; } /** @@ -673,7 +659,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie */ @CheckReturnValue public Action[] build(ActionConstructionContext context) { - setExecutionPlatform(context.getExecutionPlatform()); return build(context.getActionOwner(), context.getAnalysisEnvironment(), context.getConfiguration()); } @@ -821,8 +806,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie progressMessage, new CompositeRunfilesSupplier( Iterables.concat(this.inputRunfilesSuppliers, this.toolRunfilesSuppliers)), - mnemonic, - executionPlatform); + mnemonic); } /** @@ -853,8 +837,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie ImmutableMap<String, String> executionInfo, CharSequence progressMessage, RunfilesSupplier runfilesSupplier, - String mnemonic, - PlatformInfo executionPlatform) { + String mnemonic) { return new SpawnAction( owner, tools, @@ -869,8 +852,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie runfilesSupplier, mnemonic, executeUnconditionally, - extraActionInfoSupplier, - executionPlatform); + extraActionInfoSupplier); } private ImmutableList<String> buildExecutableArgs( @@ -1372,11 +1354,6 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie this.disableSandboxing = true; return this; } - - public Builder setExecutionPlatform(@Nullable PlatformInfo executionPlatform) { - this.executionPlatform = executionPlatform; - return this; - } } /** diff --git a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java index 645348264f..e29f0e546a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java @@ -87,7 +87,6 @@ public final class ExtraAction extends SpawnAction { new CompositeRunfilesSupplier(shadowedAction.getRunfilesSupplier(), runfilesSupplier), mnemonic, false, - null, null); this.shadowedAction = shadowedAction; this.createDummyOutput = createDummyOutput; |