Use the in-memory metadata in blaze as the source of truth for Fileset mappings

instead of the manifest files.

RELNOTES: None
PiperOrigin-RevId: 195149880

5 files changed, 7 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
index 84acbdf725..147c6922a6 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
@@ -66,6 +66,7 @@ public abstract class FileWriteActionTestCase extends BuildViewTestCase {
             null,
             new FileOutErr(),
             ImmutableMap.<String, String>of(),
+            ImmutableMap.of(),
             null);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
index b72c51ea55..a212893fac 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
@@ -178,6 +178,7 @@ public class ParamFileWriteActionTest extends BuildViewTestCase {
         null,
         new FileOutErr(),
         ImmutableMap.<String, String>of(),
+        ImmutableMap.of(),
         artifactExpander);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java
index 48428ecbe4..2fdc15f929 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java
@@ -191,7 +191,9 @@ public class SpawnActionTest extends BuildViewTestCase {
             "/bin/java", "-Xverify:none", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass", "-X")
         .inOrder();
 
-    Spawn spawn = action.getSpawn((artifact, outputs) -> outputs.add(artifact), ImmutableMap.of());
+    Spawn spawn =
+        action.getSpawn(
+            (artifact, outputs) -> outputs.add(artifact), ImmutableMap.of(), ImmutableMap.of());
     String paramFileName = output.getExecPathString() + "-0.params";
     // The spawn's primary arguments should reference the param file
     assertThat(spawn.getArguments())
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
index 81979db7e7..75446137cd 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
@@ -88,6 +88,7 @@ public class SymlinkActionTest extends BuildViewTestCase {
                 null,
                 null,
                 ImmutableMap.<String, String>of(),
+                ImmutableMap.of(),
                 null));
     assertThat(actionResult.spawnResults()).isEmpty();
     assertThat(output.isSymbolicLink()).isTrue();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
index b2e3006f30..9f2cd5ea04 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
@@ -191,6 +191,7 @@ public class TemplateExpansionActionTest extends FoundationTestCase {
         null,
         new FileOutErr(),
         ImmutableMap.<String, String>of(),
+        ImmutableMap.of(),
         null);
   }