diff options
| author |  ruperts <ruperts@google.com> | 2017-12-20 18:17:28 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-20 18:18:47 -0800 |
| commit | c3de468305734dc4b0e7222fdd8dd6eb1b661c34 (patch) | |
| tree | 4fd1cc39e30cb306454a8736b64e2df2e036f4ff /src/main/java/com/google/devtools/build/lib/sandbox | |
| parent | 16c36c3f15574a40e34e697f92fe86a4e44e9851 (diff) | |
Move compulsory ProcessWrapperUtil parameters into its builder() method, to be consistent with LinuxSandboxUtil.
RELNOTES: None.
PiperOrigin-RevId: 179758847
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/sandbox')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java index e554865a3b..f33a8f08da 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java @@ -224,9 +224,7 @@ final class DarwinSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { commandLineArgs.add("-f"); commandLineArgs.add(sandboxConfigPath.getPathString()); commandLineArgs.addAll( - ProcessWrapperUtil.commandLineBuilder() - .setProcessWrapperPath(processWrapper.getPathString()) - .setCommandArguments(spawn.getArguments()) + ProcessWrapperUtil.commandLineBuilder(processWrapper.getPathString(), spawn.getArguments()) .setTimeout(timeout) .setKillDelay(Duration.ofSeconds(timeoutGraceSeconds)) .build()); diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java index 52c72b716e..418d5162c5 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java @@ -70,9 +70,7 @@ final class ProcessWrapperSandboxedSpawnRunner extends AbstractSandboxSpawnRunne Duration timeout = policy.getTimeout(); List<String> arguments = - ProcessWrapperUtil.commandLineBuilder() - .setProcessWrapperPath(processWrapper.getPathString()) - .setCommandArguments(spawn.getArguments()) + ProcessWrapperUtil.commandLineBuilder(processWrapper.getPathString(), spawn.getArguments()) .setTimeout(timeout) .setKillDelay(Duration.ofSeconds(timeoutGraceSeconds)) .build(); |