diff options
| author |  aehlig <aehlig@google.com> | 2017-12-20 06:02:07 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-20 07:15:58 -0800 |
| commit | fb0598878bf1b7fffe1ab7f310f705792fe47b95 (patch) | |
| tree | cd5af2be68fa13f97d52e17c7a5166a403566a58 /src/tools/remote | |
| parent | 12471a77bdd4439f17cc1a665454601c867e1286 (diff) | |
Automated rollback of commit 52b62164af031c50b7a0584303caad67af5e1d4d.
*** Reason for rollback ***
Breaks //src/test/shell/bazel:bazel_sandboxing_test
*** Original change description ***
Use linux-sandbox via the (new) LinuxSandboxUtil.
RELNOTES: None.
PiperOrigin-RevId: 179676894
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, 1 insertions, 5 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 ee2abe9e45..9918895963 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,7 +15,6 @@ 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 12a98d348b..8463bb0091 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,7 +32,6 @@ 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; @@ -318,9 +317,7 @@ public final class RemoteWorker { CommandResult cmdResult = null; Command cmd = new Command( - LinuxSandboxUtil.commandLineBuilder( - sandboxPath.getPathString(), ImmutableList.of("true")) - .buildAsArray(), + ImmutableList.of(sandboxPath.getPathString(), "--", "true").toArray(new String[0]), ImmutableMap.<String, String>of(), sandboxPath.getParentDirectory().getPathFile()); try { |