Plumb exec root through to all spawn runners.

They need this to parse input manifests. Previously we would grab the exec root from the Root, but wish to unsupport this.

PiperOrigin-RevId: 181669143

2 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java
index 5d48840b7e..4207f6d8d1 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java
@@ -47,7 +47,8 @@ final class WorkerActionContextProvider extends ActionContextProvider {
             env.getReporter(),
             createFallbackRunner(env));
 
-    WorkerSpawnStrategy workerSpawnStrategy = new WorkerSpawnStrategy(spawnRunner);
+    WorkerSpawnStrategy workerSpawnStrategy =
+        new WorkerSpawnStrategy(env.getExecRoot(), spawnRunner);
     TestActionContext workerTestStrategy =
         new WorkerTestStrategy(env, env.getOptions(), workers, extraFlags);
     this.strategies = ImmutableList.of(workerSpawnStrategy, workerTestStrategy);
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
index 890de1bd9e..462b12fce1 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.worker;
 import com.google.devtools.build.lib.actions.ExecutionStrategy;
 import com.google.devtools.build.lib.actions.SpawnActionContext;
 import com.google.devtools.build.lib.exec.AbstractSpawnStrategy;
+import com.google.devtools.build.lib.vfs.Path;
 
 /**
  * A spawn action context that launches Spawns the first time they are used in a persistent mode and
@@ -27,8 +28,8 @@ import com.google.devtools.build.lib.exec.AbstractSpawnStrategy;
 )
 public final class WorkerSpawnStrategy extends AbstractSpawnStrategy {
 
-  public WorkerSpawnStrategy(WorkerSpawnRunner spawnRunner) {
-    super(spawnRunner);
+  public WorkerSpawnStrategy(Path execRoot, WorkerSpawnRunner spawnRunner) {
+    super(execRoot, spawnRunner);
   }
 
   @Override