diff options
author | felly <felly@google.com> | 2018-08-14 17:53:30 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-14 17:55:14 -0700 |
commit | 8dece49bed76b5f372ff5d3a3f25a32b2a9c1f52 (patch) | |
tree | ff4520a4d8a6ddd06a51cbe938408ee78e7fcbe8 /src/main/java/com/google/devtools/build/lib/analysis/actions | |
parent | 2734ceb1f890d1e953acd13d4dbe6c26c0c5d2e2 (diff) |
Automated rollback of commit 37bd5f665aa614c6dc640c9d19852dd8d5efb0d8.
*** Reason for rollback ***
Rollforward with fix: Don't use Immutable map builder to agggregate Filesets. We may reach the same one via direct and indirect runfiles, so we need to allow for duplicate entries.
*** Original change description ***
Automated rollback of commit 3bace1b937934fb2cea6260067ecc1cdbe526847.
*** Reason for rollback ***
b/112583337
RELNOTES: None
*** Original change description ***
Track Fileset in artifact expansion.
PiperOrigin-RevId: 208748163
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/actions')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index 493f249532..ce9eeeeb03 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -356,7 +356,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie return getSpawn( actionExecutionContext.getArtifactExpander(), actionExecutionContext.getClientEnv(), - actionExecutionContext.getInputFilesetMappings()); + actionExecutionContext.getTopLevelFilesets()); } Spawn getSpawn( |