1 files changed, 7 insertions, 5 deletions
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 8c4d14aa79..39b9f4c5bd 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
@@ -24,6 +24,7 @@ import com.google.devtools.build.lib.actions.Action;
 import com.google.devtools.build.lib.actions.ActionEnvironment;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.ActionExecutionException;
+import com.google.devtools.build.lib.actions.ActionResult;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.CompositeRunfilesSupplier;
 import com.google.devtools.build.lib.actions.RunfilesSupplier;
@@ -147,17 +148,16 @@ public final class ExtraAction extends SpawnAction {
   /**
    * @InheritDoc
    *
-   * This method calls in to {@link AbstractAction#getInputFilesForExtraAction} and
-   * {@link Action#getExtraActionInfo} of the action being shadowed from the thread executing this
+   * <p>This method calls in to {@link AbstractAction#getInputFilesForExtraAction} and {@link
+   * Action#getExtraActionInfo} of the action being shadowed from the thread executing this
    * ExtraAction. It assumes these methods are safe to call from a different thread than the thread
    * responsible for the execution of the action being shadowed.
    */
   @Override
-  public void execute(ActionExecutionContext actionExecutionContext)
+  public ActionResult execute(ActionExecutionContext actionExecutionContext)
       throws ActionExecutionException, InterruptedException {
     // PHASE 2: execution of extra_action.
-
-    super.execute(actionExecutionContext);
+    ActionResult actionResult = super.execute(actionExecutionContext);
 
     // PHASE 3: create dummy output.
     // If the user didn't specify output, we need to create dummy output
@@ -171,6 +171,8 @@ public final class ExtraAction extends SpawnAction {
         }
       }
     }
+
+    return actionResult;
   }
 
   /**