Simplified ActionContextConsumer by having it operate on a new class which holds a variety of strategy/context maps.

PiperOrigin-RevId: 190491357

1 files changed, 5 insertions, 4 deletions

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 3a5b225cdf..fc068bcce4 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
@@ -257,8 +257,8 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie
    */
   protected List<SpawnResult> internalExecute(ActionExecutionContext actionExecutionContext)
       throws ExecException, InterruptedException, CommandLineExpansionException {
-    return getContext(actionExecutionContext)
-        .exec(getSpawn(actionExecutionContext.getClientEnv()), actionExecutionContext);
+    Spawn spawn = getSpawn(actionExecutionContext.getClientEnv());
+    return getContext(actionExecutionContext, spawn).exec(spawn, actionExecutionContext);
   }
 
   @Override
@@ -449,8 +449,9 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie
     return executionInfo;
   }
 
-  protected SpawnActionContext getContext(ActionExecutionContext actionExecutionContext) {
-    return actionExecutionContext.getSpawnActionContext(getMnemonic());
+  protected SpawnActionContext getContext(
+      ActionExecutionContext actionExecutionContext, Spawn spawn) {
+    return actionExecutionContext.getSpawnActionContext(getMnemonic(), spawn);
   }
 
   /**