From 663beb61e4e7c8f708d3e058a670cc977d6a1362 Mon Sep 17 00:00:00 2001
From: Tiago Quelhas <tjgq@google.com>
Date: Wed, 29 Nov 2023 14:54:38 +0100
Subject: [PATCH] [7.0.0] Remove RunfilesSupplier.getManifest(). (#20357)

It appears to be always empty.

RELNOTES: None.
PiperOrigin-RevId: 585627763
Change-Id: I7f39896c7f3a4ffb1040211265793b7f64d8d64d

Co-authored-by: Googler <lberki@google.com>
---
 .../devtools/build/lib/analysis/actions/SpawnAction.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 c0afd349ff13f1..4a31e6a99487a5 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
@@ -516,7 +516,14 @@ private ActionSpawn(
           parent.getRunfilesSupplier(),
           parent,
           parent.resourceSetOrBuilder);
-      this.inputs = getNonFilesetInputs(inputs).addAll(additionalInputs).build();
+      NestedSetBuilder<ActionInput> inputsBuilder = NestedSetBuilder.stableOrder();
+      for (Artifact input : inputs.toList()) {
+        if (!input.isFileset()) {
+          inputsBuilder.add(input);
+        }
+      }
+      inputsBuilder.addAll(additionalInputs);
+      this.inputs = inputsBuilder.build();
       this.filesetMappings = filesetMappings;
       this.pathMapper = pathMapper;