diff options
| author |  ruperts <ruperts@google.com> | 2017-12-20 07:27:47 +0100 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2017-12-20 13:42:31 +0100 |
| commit | 52b62164af031c50b7a0584303caad67af5e1d4d (patch) | |
| tree | 3c8fb51cccd8cd447d685260a783e17d7c2cbfcb /src/tools/remote | |
| parent | 87dd180cbb10be3cafbdad27fadc80a8502503e8 (diff) | |
Use linux-sandbox via the (new) LinuxSandboxUtil.
RELNOTES: None.
PiperOrigin-RevId: 179646155
Diffstat (limited to 'src/tools/remote')
| -rw-r--r-- | src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD | 1 | ||||
| -rw-r--r-- | src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD index 9918895963..ee2abe9e45 100644 --- a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD @@ -15,6 +15,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:os_util", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:process_util", + "//src/main/java/com/google/devtools/build/lib:runtime", "//src/main/java/com/google/devtools/build/lib:single-line-formatter", "//src/main/java/com/google/devtools/build/lib:unix", "//src/main/java/com/google/devtools/build/lib:util", diff --git a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java index 8463bb0091..12a98d348b 100644 --- a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.remote.TracingMetadataUtils; import com.google.devtools.build.lib.remote.blobstore.ConcurrentMapBlobStore; import com.google.devtools.build.lib.remote.blobstore.OnDiskBlobStore; import com.google.devtools.build.lib.remote.blobstore.SimpleBlobStore; +import com.google.devtools.build.lib.runtime.LinuxSandboxUtil; import com.google.devtools.build.lib.shell.Command; import com.google.devtools.build.lib.shell.CommandException; import com.google.devtools.build.lib.shell.CommandResult; @@ -317,7 +318,9 @@ public final class RemoteWorker { CommandResult cmdResult = null; Command cmd = new Command( - ImmutableList.of(sandboxPath.getPathString(), "--", "true").toArray(new String[0]), + LinuxSandboxUtil.commandLineBuilder( + sandboxPath.getPathString(), ImmutableList.of("true")) + .buildAsArray(), ImmutableMap.<String, String>of(), sandboxPath.getParentDirectory().getPathFile()); try { |