diff options
author | 2018-04-25 10:57:31 -0700 | |
---|---|---|
committer | 2018-04-25 10:59:12 -0700 | |
commit | 936139d1b8bcf75a772d3e988b342c4ec8fd507d (patch) | |
tree | 316923cbe2acdfa593ebf57f76d3fd5063970a61 /src/main/java/com/google/devtools/build/lib/rules/cpp | |
parent | 1d49184b071b281c83939416d7eead671729c8b5 (diff) |
Support deferred param files.
Design doc: https://docs.google.com/document/d/1JXqwwVHYosZOgmjN8xrfTalyhiUYJ99Qe2D0qBcqZ1c
The behaviour is gated on --defer_param_files (default off) and is controlled by --min_param_file_size.
This CL adds support for VirtualActionInputs to LocalSpawnRunner, and all remote runners already supports them. The sandboxed runners are not yet supported, but that can be added in a future CL.
This CL does not add support for spawn runner using different param file limits. This will require refactoring of the spawn strategies and runners to be viable.
RELNOTES: None
PiperOrigin-RevId: 194265291
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java index ce171002b6..857e457a22 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java @@ -24,8 +24,9 @@ import com.google.devtools.build.lib.actions.ActionExecutionException; import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.CommandLine; import com.google.devtools.build.lib.actions.CommandLineExpansionException; +import com.google.devtools.build.lib.actions.CommandLines; +import com.google.devtools.build.lib.actions.CommandLines.CommandLineLimits; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.RunfilesSupplier; import com.google.devtools.build.lib.analysis.actions.SpawnAction; @@ -67,8 +68,10 @@ public final class LtoBackendAction extends SpawnAction { Map<PathFragment, Artifact> allBitcodeFiles, Artifact importsFile, Collection<Artifact> outputs, + Artifact primaryOutput, ActionOwner owner, - CommandLine argv, + CommandLines argv, + CommandLineLimits commandLineLimits, boolean isShellCommand, ActionEnvironment env, Map<String, String> executionInfo, @@ -80,8 +83,10 @@ public final class LtoBackendAction extends SpawnAction { ImmutableList.<Artifact>of(), inputs, outputs, + primaryOutput, AbstractAction.DEFAULT_RESOURCE_SET, argv, + commandLineLimits, isShellCommand, env, ImmutableMap.copyOf(executionInfo), @@ -220,8 +225,10 @@ public final class LtoBackendAction extends SpawnAction { NestedSet<Artifact> tools, NestedSet<Artifact> inputsAndTools, ImmutableList<Artifact> outputs, + Artifact primaryOutput, ResourceSet resourceSet, - CommandLine actualCommandLine, + CommandLines commandLines, + CommandLineLimits commandLineLimits, boolean isShellCommand, ActionEnvironment env, ImmutableMap<String, String> executionInfo, @@ -233,8 +240,10 @@ public final class LtoBackendAction extends SpawnAction { bitcodeFiles, imports, outputs, + primaryOutput, owner, - actualCommandLine, + commandLines, + commandLineLimits, isShellCommand, env, executionInfo, |