diff options
| author |  Googler <noreply@google.com> | 2017-05-15 18:05:46 +0200 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2017-05-15 19:51:27 +0200 |
| commit | 48034fdb65b3c8e9f2860ff3038d4189945f02e0 (patch) | |
| tree | ed97f9f76b2c1fb4ae22069406cb8a41499cab17 /src/main/java/com/google/devtools/build/lib/rules/extra | |
| parent | 34cdd98497bc2cceca9a8a2827f0a2499e806d0f (diff) | |
Remove methods from CommandLine, making it a simple argument list interface.
* isShellCommand is now passed directly to SpawnAction
* Getting the associated params file action was a test-only thing. We can pull this out of the action graph instead.
PiperOrigin-RevId: 156060366
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/extra')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java index 930cc932c7..a947232147 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraAction.java @@ -81,11 +81,14 @@ public final class ExtraAction extends SpawnAction { shadowedAction.getOwner(), ImmutableList.<Artifact>of(), createInputs( - shadowedAction.getInputs(), ImmutableList.<Artifact>of(), extraActionInputs, + shadowedAction.getInputs(), + ImmutableList.<Artifact>of(), + extraActionInputs, runfilesSupplier), outputs, AbstractAction.DEFAULT_RESOURCE_SET, argv, + false, ImmutableMap.copyOf(environment), ImmutableSet.copyOf(clientEnvironmentVariables), ImmutableMap.copyOf(executionInfo), diff --git a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java index 90de182573..65a81d91ee 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java +++ b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java @@ -144,7 +144,7 @@ public final class ExtraActionSpec implements TransitiveInfoProvider { extraActionOutputs, actionToShadow, createDummyOutput, - CommandLine.of(argv, false), + CommandLine.of(argv), env, clientEnvVars, executionInfo, |