2 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
index b037dad115..8b35723646 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
@@ -21,7 +21,7 @@ import com.google.common.io.Files;
 import com.google.devtools.build.lib.actions.ExecException;
 import com.google.devtools.build.lib.actions.UserExecException;
 import com.google.devtools.build.lib.analysis.config.BinTools;
-import com.google.devtools.build.lib.runtime.BlazeRuntime;
+import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.shell.AbnormalTerminationException;
 import com.google.devtools.build.lib.shell.Command;
 import com.google.devtools.build.lib.shell.CommandException;
@@ -79,9 +79,9 @@ public class NamespaceSandboxRunner {
     this.sandboxDebug = sandboxDebug;
   }
 
-  static boolean isSupported(BlazeRuntime runtime) {
-    Path execRoot = runtime.getExecRoot();
-    BinTools binTools = runtime.getBinTools();
+  static boolean isSupported(CommandEnvironment commandEnv) {
+    Path execRoot = commandEnv.getExecRoot();
+    BinTools binTools = commandEnv.getRuntime().getBinTools();
 
     PathFragment embeddedTool = binTools.getExecPath(NAMESPACE_SANDBOX);
     if (embeddedTool == null) {
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java
index b04267f0ad..7187937a74 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java
@@ -22,7 +22,6 @@ import com.google.devtools.build.lib.buildtool.buildevent.BuildStartingEvent;
 import com.google.devtools.build.lib.concurrent.ExecutorUtil;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.runtime.BlazeModule;
-import com.google.devtools.build.lib.runtime.BlazeRuntime;
 import com.google.devtools.build.lib.runtime.Command;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.util.OS;
@@ -49,9 +48,9 @@ public class SandboxModule extends BlazeModule {
   private CommandEnvironment env;
   private BuildRequest buildRequest;
 
-  private synchronized boolean isSandboxingSupported(BlazeRuntime runtime) {
+  private synchronized boolean isSandboxingSupported(CommandEnvironment env) {
     if (sandboxingSupported == null) {
-      sandboxingSupported = NamespaceSandboxRunner.isSupported(runtime);
+      sandboxingSupported = NamespaceSandboxRunner.isSupported(env);
     }
     return sandboxingSupported.booleanValue();
   }
@@ -60,7 +59,7 @@ public class SandboxModule extends BlazeModule {
   public Iterable<ActionContextProvider> getActionContextProviders() {
     Preconditions.checkNotNull(buildRequest);
     Preconditions.checkNotNull(env);
-    if (isSandboxingSupported(env.getRuntime())) {
+    if (isSandboxingSupported(env)) {
       return ImmutableList.<ActionContextProvider>of(
           new SandboxActionContextProvider(env, buildRequest, backgroundWorkers));
     }
@@ -78,7 +77,7 @@ public class SandboxModule extends BlazeModule {
   @Override
   public Iterable<ActionContextConsumer> getActionContextConsumers() {
     Preconditions.checkNotNull(env);
-    if (isSandboxingSupported(env.getRuntime())) {
+    if (isSandboxingSupported(env)) {
       return ImmutableList.<ActionContextConsumer>of(new SandboxActionContextConsumer());
     }
     return ImmutableList.of();