From e5b7c591f44487b55a850870f5db660212402b60 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Mon, 18 Jan 2016 11:03:59 +0000 Subject: Do not use sandboxing when bootstrapping This simplify the bootstrap process and remove a C++ tool from the bootstrap binary. -- MOS_MIGRATED_REVID=112394555 --- .../com/google/devtools/build/lib/runtime/commands/RunCommand.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/runtime') diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java index 54353d5f89..34f6819afd 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java @@ -246,8 +246,11 @@ public class RunCommand implements BlazeCommand { options.getOptions(BuildRequestOptions.class).getSymlinkPrefix()); List cmdLine = new ArrayList<>(); if (runOptions.scriptPath == null) { + PathFragment processWrapperPath = runtime.getBinTools().getExecPath(PROCESS_WRAPPER); + Preconditions.checkNotNull( + processWrapperPath, PROCESS_WRAPPER + " not found in embedded tools"); cmdLine.add(runtime.getDirectories().getExecRoot() - .getRelative(runtime.getBinTools().getExecPath(PROCESS_WRAPPER)).getPathString()); + .getRelative(processWrapperPath).getPathString()); cmdLine.add("-1"); cmdLine.add("15"); cmdLine.add("-"); -- cgit v1.2.3