diff options
author | 2015-10-01 01:53:45 +0000 | |
---|---|---|
committer | 2015-10-01 12:17:15 +0000 | |
commit | c2e199d6d98e95423a2c698138b9074f2b452270 (patch) | |
tree | 91f504456beab79663d5ba3f279bf5df9f5d3f4c /src | |
parent | 06603ea382340d73445ae40bbf714e7ee486f3d5 (diff) |
Make explicit that an extra action always has the same owner as the action it is shadowing.
--
MOS_MIGRATED_REVID=104359435
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java | 6 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java index d2ad58c9d9..13cb5b5c56 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.actions.AbstractAction; import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionExecutionException; -import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactResolver; import com.google.devtools.build.lib.actions.DelegateSpawn; @@ -62,7 +61,7 @@ public final class ExtraAction extends SpawnAction { @GuardedBy("this") private boolean inputsKnown; - public ExtraAction(ActionOwner owner, + public ExtraAction( ImmutableSet<Artifact> extraActionInputs, Map<PathFragment, Artifact> runfilesManifests, Collection<Artifact> outputs, @@ -73,7 +72,8 @@ public final class ExtraAction extends SpawnAction { Map<String, String> executionInfo, String progressMessage, String mnemonic) { - super(owner, + super( + shadowedAction.getOwner(), createInputs(shadowedAction.getInputs(), extraActionInputs), outputs, AbstractAction.DEFAULT_RESOURCE_SET, diff --git a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java index a1e31667ab..dbc9e23275 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java +++ b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java @@ -133,7 +133,6 @@ public final class ExtraActionSpec implements TransitiveInfoProvider { String commandMessage = String.format("Executing extra_action %s on %s", label, ownerLabel); owningRule.registerAction(new ExtraAction( - actionToShadow.getOwner(), ImmutableSet.copyOf(extraActionInputs.build()), manifests, extraActionOutputs, |