diff options
| author |  Benjamin Peterson <bp@benjamin.pe> | 2017-08-07 14:16:47 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-08-07 14:49:58 +0200 |
| commit | 904563c35b23e3b3f3c171ab0a6189dccd384b39 (patch) | |
| tree | e87092c8f9a6f193a453e526699e7598cd5b4025 /src | |
| parent | 26d0e49f9ac8418d8b04e22ece9e1068866c82d5 (diff) | |
Do not expand inputs in CppLinkAction.execute().
All spawn strategies must expand artifacts, so actions shouldn't
themselves.
Change-Id: I051f7a6fee31330893271fbec7b93197bd4292f3
PiperOrigin-RevId: 164449128
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java index e31dc4d396..5ceaf00cf0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java @@ -25,7 +25,6 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.AbstractAction; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionExecutionException; -import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.CommandAction; @@ -54,7 +53,6 @@ import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import java.io.IOException; -import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; @@ -302,17 +300,12 @@ public final class CppLinkAction extends AbstractAction executeFake(); } else { try { - // Collect input files - List<ActionInput> allInputs = new ArrayList<>(); - Artifact.addExpandedArtifacts( - getMandatoryInputs(), allInputs, actionExecutionContext.getArtifactExpander()); - Spawn spawn = new SimpleSpawn( this, ImmutableList.copyOf(getCommandLine()), getEnvironment(), getExecutionInfo(), - ImmutableList.copyOf(allInputs), + ImmutableList.copyOf(getMandatoryInputs()), getOutputs().asList(), estimateResourceConsumptionLocal()); actionExecutionContext.getSpawnActionContext(getMnemonic()) |