aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/sandbox
diff options
context:
space:
mode:
authorGravatar Dmitry Lomov <dslomov@google.com>2015-08-31 12:43:28 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2015-08-31 19:13:47 +0000
commit65536bfc47de4705ad3637021370d55f18c470ab (patch)
tree42e611f7ee5bb6933ebc9bb55037c3eda4e3348a /src/main/java/com/google/devtools/build/lib/sandbox
parentfc154ae77180544ec3bcac19b7a86ad091d6526e (diff)
Fix namespace-sandbox executable name.
-- MOS_MIGRATED_REVID=101926862
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/sandbox')
-rw-r--r--src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java5
1 files changed, 4 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 686631248d..36a643e5f5 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
@@ -23,6 +23,7 @@ import com.google.devtools.build.lib.runtime.BlazeRuntime;
import com.google.devtools.build.lib.shell.Command;
import com.google.devtools.build.lib.shell.CommandException;
import com.google.devtools.build.lib.unix.FilesystemUtils;
+import com.google.devtools.build.lib.util.OsUtils;
import com.google.devtools.build.lib.util.io.FileOutErr;
import com.google.devtools.build.lib.util.io.OutErr;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -40,6 +41,8 @@ import java.util.List;
* sandbox, handles sandbox output, performs cleanup and changes invocation if necessary.
*/
public class NamespaceSandboxRunner {
+ private static final String NAMESPACE_SANDBOX =
+ "namespace-sandbox" + OsUtils.executableExtension();
private final Path execRoot;
private final Path sandboxPath;
private final Path sandboxExecRoot;
@@ -61,7 +64,7 @@ public class NamespaceSandboxRunner {
BinTools binTools = runtime.getBinTools();
List<String> args = new ArrayList<>();
- args.add(execRoot.getRelative(binTools.getExecPath("namespace-sandbox")).getPathString());
+ args.add(execRoot.getRelative(binTools.getExecPath(NAMESPACE_SANDBOX)).getPathString());
args.add("-C");
ImmutableMap<String, String> env = ImmutableMap.of();