Move the clientEnv to the CommandEnvironment.

--
MOS_MIGRATED_REVID=103269584

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java
index 61cd2cdbd1..65b35c9cdc 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java
@@ -19,7 +19,7 @@ import com.google.devtools.build.lib.actions.ActionContextProvider;
 import com.google.devtools.build.lib.actions.Executor.ActionContext;
 import com.google.devtools.build.lib.buildtool.BuildRequest;
 import com.google.devtools.build.lib.exec.ExecutionOptions;
-import com.google.devtools.build.lib.runtime.BlazeRuntime;
+import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.util.OS;
 
 import java.util.concurrent.ExecutorService;
@@ -33,7 +33,7 @@ public class SandboxActionContextProvider extends ActionContextProvider {
   private final ImmutableList<ActionContext> strategies;
 
   public SandboxActionContextProvider(
-      BlazeRuntime runtime, BuildRequest buildRequest, ExecutorService backgroundWorkers) {
+      CommandEnvironment env, BuildRequest buildRequest, ExecutorService backgroundWorkers) {
     boolean verboseFailures = buildRequest.getOptions(ExecutionOptions.class).verboseFailures;
     boolean sandboxDebug = buildRequest.getOptions(SandboxOptions.class).sandboxDebug;
     Builder<ActionContext> strategies = ImmutableList.builder();
@@ -41,8 +41,8 @@ public class SandboxActionContextProvider extends ActionContextProvider {
     if (OS.getCurrent() == OS.LINUX) {
       strategies.add(
           new LinuxSandboxedStrategy(
-              runtime.getClientEnv(),
-              runtime.getDirectories(),
+              env.getClientEnv(),
+              env.getDirectories(),
               backgroundWorkers,
               verboseFailures,
               sandboxDebug));