Rename namespace-sandbox/-runner to linux-sandbox.

--
MOS_MIGRATED_REVID=127538990

4 files changed, 12 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
index 1fe3fba497..6071bfc5cd 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
@@ -6,7 +6,7 @@ java_library(
     name = "sandbox",
     srcs = glob(["*.java"]),
     data = [
-        "//src/main/tools:namespace-sandbox",
+        "//src/main/tools:linux-sandbox",
     ],
     deps = [
         "//src/main/java/com/google/devtools/build/lib:build-base",
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxRunner.java
index 9516fe2753..bae4ec9d45 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxRunner.java
@@ -31,7 +31,6 @@ import com.google.devtools.build.lib.util.io.FileOutErr;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -40,12 +39,11 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * Helper class for running the namespace sandbox. This runner prepares environment inside the
- * sandbox, handles sandbox output, performs cleanup and changes invocation if necessary.
+ * Helper class for running the Linux sandbox. This runner prepares environment inside the sandbox,
+ * handles sandbox output, performs cleanup and changes invocation if necessary.
  */
-public class NamespaceSandboxRunner {
-  private static final String NAMESPACE_SANDBOX =
-      "namespace-sandbox" + OsUtils.executableExtension();
+public class LinuxSandboxRunner {
+  private static final String LINUX_SANDBOX = "linux-sandbox" + OsUtils.executableExtension();
   private static final String SANDBOX_TIP =
       "\n\nSandboxed execution failed, which may be legitimate (e.g. a compiler error), "
           + "or due to missing dependencies. To enter the sandbox environment for easier debugging,"
@@ -60,7 +58,7 @@ public class NamespaceSandboxRunner {
   private final boolean verboseFailures;
   private final boolean sandboxDebug;
 
-  public NamespaceSandboxRunner(
+  public LinuxSandboxRunner(
       Path execRoot,
       Path sandboxPath,
       ImmutableMap<Path, Path> mounts,
@@ -82,7 +80,7 @@ public class NamespaceSandboxRunner {
     Path execRoot = commandEnv.getExecRoot();
 
     PathFragment embeddedTool =
-        commandEnv.getBlazeWorkspace().getBinTools().getExecPath(NAMESPACE_SANDBOX);
+        commandEnv.getBlazeWorkspace().getBinTools().getExecPath(LINUX_SANDBOX);
     if (embeddedTool == null) {
       // The embedded tool does not exist, meaning that we don't support sandboxing (e.g., while
       // bootstrapping).
@@ -135,7 +133,7 @@ public class NamespaceSandboxRunner {
     List<String> fileArgs = new ArrayList<>();
     List<String> commandLineArgs = new ArrayList<>();
 
-    commandLineArgs.add(execRoot.getRelative("_bin/namespace-sandbox").getPathString());
+    commandLineArgs.add(execRoot.getRelative("_bin/linux-sandbox").getPathString());
 
     if (sandboxDebug) {
       fileArgs.add("-D");
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
index dadd5691dc..9a04ed870c 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
@@ -49,7 +49,6 @@ import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.vfs.SearchPath;
 import com.google.devtools.build.lib.vfs.Symlinks;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -155,8 +154,8 @@ public class LinuxSandboxedStrategy implements SpawnActionContext {
     }
 
     try {
-      final NamespaceSandboxRunner runner =
-          new NamespaceSandboxRunner(
+      final LinuxSandboxRunner runner =
+          new LinuxSandboxRunner(
               execRoot,
               sandboxPath,
               mounts,
@@ -217,7 +216,7 @@ public class LinuxSandboxedStrategy implements SpawnActionContext {
   /**
    * Most programs expect certain directories to be present, e.g. /tmp. Make sure they are.
    *
-   * <p>Note that $HOME is handled by namespace-sandbox.c, because it changes user to nobody and the
+   * <p>Note that $HOME is handled by linux-sandbox.c, because it changes user to nobody and the
    * home directory of that user is not known by us.
    */
   private ImmutableSet<Path> createImportantDirs(Map<String, String> env) {
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 04f6169715..be3dc04008 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
@@ -27,7 +27,6 @@ import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.common.options.OptionsBase;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -50,7 +49,7 @@ public class SandboxModule extends BlazeModule {
 
   private synchronized boolean isSandboxingSupported(CommandEnvironment env) {
     if (sandboxingSupported == null) {
-      sandboxingSupported = NamespaceSandboxRunner.isSupported(env);
+      sandboxingSupported = LinuxSandboxRunner.isSupported(env);
     }
     return sandboxingSupported.booleanValue();
   }