2 files changed, 3 insertions, 4 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 8f2fda7acb..584f0867aa 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
@@ -36,7 +36,7 @@ final class WorkerActionContextProvider extends ActionContextProvider {
 
     WorkerSpawnStrategy workerSpawnStrategy =
         new WorkerSpawnStrategy(
-            env.getDirectories(),
+            env.getExecRoot(),
             workers,
             buildRequest.getOptions(ExecutionOptions.class).verboseFailures,
             maxRetries,
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 a81ef6eb52..a80f542ec8 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
@@ -39,7 +39,6 @@ import com.google.devtools.build.lib.actions.SandboxedSpawnActionContext;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnActionContext;
 import com.google.devtools.build.lib.actions.UserExecException;
-import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.sandbox.SandboxHelpers;
@@ -184,7 +183,7 @@ public final class WorkerSpawnStrategy implements SandboxedSpawnActionContext {
   private final boolean workerVerbose;
 
   public WorkerSpawnStrategy(
-      BlazeDirectories blazeDirs,
+      Path execRoot,
       WorkerPool workers,
       boolean verboseFailures,
       int maxRetries,
@@ -192,7 +191,7 @@ public final class WorkerSpawnStrategy implements SandboxedSpawnActionContext {
       Multimap<String, String> extraFlags) {
     Preconditions.checkNotNull(workers);
     this.workers = Preconditions.checkNotNull(workers);
-    this.execRoot = blazeDirs.getExecRoot();
+    this.execRoot = execRoot;
     this.verboseFailures = verboseFailures;
     this.maxRetries = maxRetries;
     this.workerVerbose = workerVerbose;