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, 4 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
index f5c45af117..08ac0cea1e 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
@@ -91,7 +91,7 @@ public class StandaloneActionContextProvider extends ActionContextProvider {
     // could potentially be used and a spawnActionContext doesn't specify which one it wants, the
     // last one from strategies list will be used
     return ImmutableList.of(
-        new StandaloneSpawnStrategy(createLocalRunner(env)),
+        new StandaloneSpawnStrategy(env.getExecRoot(), createLocalRunner(env)),
         new DummyIncludeScanningContext(),
         new SpawnGccStrategy(),
         testStrategy,
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
index bbc1874676..e08c962c77 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
@@ -17,14 +17,15 @@ 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.exec.SpawnRunner;
+import com.google.devtools.build.lib.vfs.Path;
 
 /**
  * Strategy that uses subprocessing to execute a process.
  */
 @ExecutionStrategy(name = { "standalone", "local" }, contextType = SpawnActionContext.class)
 public class StandaloneSpawnStrategy extends AbstractSpawnStrategy {
-  public StandaloneSpawnStrategy(SpawnRunner spawnRunner) {
-    super(spawnRunner);
+  public StandaloneSpawnStrategy(Path execRoot, SpawnRunner spawnRunner) {
+    super(execRoot, spawnRunner);
   }
 
   @Override