From c2e199d6d98e95423a2c698138b9074f2b452270 Mon Sep 17 00:00:00 2001
From: Janak Ramakrishnan <janakr@google.com>
Date: Thu, 1 Oct 2015 01:53:45 +0000
Subject: Make explicit that an extra action always has the same owner as the
 action it is shadowing.

--
MOS_MIGRATED_REVID=104359435
---
 .../java/com/google/devtools/build/lib/rules/extra/ExtraAction.java | 6 +++---
 .../com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/google/devtools')

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,
-- 
cgit v1.2.3