Skip to content

Commit 663beb6

Browse files
tjgqlberki
authored andcommitted
[7.0.0] Remove RunfilesSupplier.getManifest(). (bazelbuild#20357)
It appears to be always empty. RELNOTES: None. PiperOrigin-RevId: 585627763 Change-Id: I7f39896c7f3a4ffb1040211265793b7f64d8d64d Co-authored-by: Googler <[email protected]>
1 parent d798ebd commit 663beb6

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,14 @@ private ActionSpawn(
516516
parent.getRunfilesSupplier(),
517517
parent,
518518
parent.resourceSetOrBuilder);
519-
this.inputs = getNonFilesetInputs(inputs).addAll(additionalInputs).build();
519+
NestedSetBuilder<ActionInput> inputsBuilder = NestedSetBuilder.stableOrder();
520+
for (Artifact input : inputs.toList()) {
521+
if (!input.isFileset()) {
522+
inputsBuilder.add(input);
523+
}
524+
}
525+
inputsBuilder.addAll(additionalInputs);
526+
this.inputs = inputsBuilder.build();
520527
this.filesetMappings = filesetMappings;
521528
this.pathMapper = pathMapper;
522529

0 commit comments

Comments
 (0)