commit e5b7c591f44487b55a850870f5db660212402b60
author Damien Martin-Guillerez <dmarting@google.com> Mon Jan 18 11:03:59 2016 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Mon Jan 18 14:34:55 2016 +0000
tree 761200b1b83815f4095d5df06f9a0c4f9b60e11f
parent 198a54f95e88d7547e0458aba8ab63833005b81b

Do not use sandboxing when bootstrapping

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

--
MOS_MIGRATED_REVID=112394555

src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
index b74dd1a..b557a6a 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.exec;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.devtools.build.lib.actions.AbstractAction;
@@ -120,9 +121,9 @@
    * Returns the complete argument list build-runfiles has to be called with.
    */
   private List<String> getSpawnArgumentList(Path execRoot, BinTools binTools) {
-    List<String> args = Lists.newArrayList(
-        execRoot.getRelative(binTools.getExecPath(BUILD_RUNFILES))
-            .getPathString());
+    PathFragment path = binTools.getExecPath(BUILD_RUNFILES);
+    Preconditions.checkNotNull(path, BUILD_RUNFILES + " not found in embedded tools");
+    List<String> args = Lists.newArrayList(execRoot.getRelative(path).getPathString());
 
     if (filesetTree) {
       args.add("--allow_relative");