Do not use sandboxing when bootstrapping

This simplify the bootstrap process and remove a C++ tool from
the bootstrap binary.

--
MOS_MIGRATED_REVID=112394555

1 files changed, 8 insertions, 1 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 1fb5021e7d..7fae775e33 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
@@ -79,8 +79,15 @@ public class NamespaceSandboxRunner {
     Path execRoot = runtime.getExecRoot();
     BinTools binTools = runtime.getBinTools();
 
+    PathFragment embeddedTool = binTools.getExecPath(NAMESPACE_SANDBOX);
+    if (embeddedTool == null) {
+      // The embedded tool does not exist, meaning that we don't support sandboxing (e.g., while
+      // bootstrapping).
+      return false;
+    }
+
     List<String> args = new ArrayList<>();
-    args.add(execRoot.getRelative(binTools.getExecPath(NAMESPACE_SANDBOX)).getPathString());
+    args.add(execRoot.getRelative(embeddedTool).getPathString());
     args.add("-C");
 
     ImmutableMap<String, String> env = ImmutableMap.of();