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

20 files changed, 47 insertions, 29 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
index 83e3f31030..6124b914b8 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
@@ -64,6 +64,7 @@ public class ExecutableSymlinkActionTest {
         null,
         outErr,
         ImmutableMap.<String, String>of(),
+        ImmutableMap.of(),
         null);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 753a73e221..29e9c230c7 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -143,6 +143,7 @@ public final class ActionsTestUtil {
         metadataHandler,
         fileOutErr,
         ImmutableMap.copyOf(clientEnv),
+        ImmutableMap.of(),
         actionGraph == null
             ? createDummyArtifactExpander()
             : ActionInputHelper.actionGraphArtifactExpander(actionGraph));
@@ -177,6 +178,7 @@ public final class ActionsTestUtil {
         null,
         null,
         ImmutableMap.of(),
+        ImmutableMap.of(),
         createDummyArtifactExpander());
   }
 
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);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index f80db7e6d1..eaca063305 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -2090,6 +2090,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
           /*metadataHandler=*/ null,
           actionLogBufferPathGenerator.generate(),
           clientEnv,
+          ImmutableMap.of(),
           artifactExpander);
     }
   }
diff --git a/src/test/java/com/google/devtools/build/lib/exec/FilesetManifestTest.java b/src/test/java/com/google/devtools/build/lib/exec/FilesetManifestTest.java
index fc13b44653..391cd16d41 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/FilesetManifestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/FilesetManifestTest.java
@@ -62,7 +62,7 @@ public class FilesetManifestTest {
     Artifact artifact =
         new Artifact(fs.getPath("/root/foo"), ArtifactRoot.asSourceRoot(Root.fromPath(execRoot)));
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", IGNORE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", IGNORE);
     assertThat(manifest.getEntries()).isEmpty();
   }
 
@@ -78,7 +78,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", IGNORE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", IGNORE);
     assertThat(manifest.getEntries())
         .containsExactly(PathFragment.create("out/foo/bar"), "/dir/file");
   }
@@ -97,7 +97,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", IGNORE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", IGNORE);
     assertThat(manifest.getEntries())
         .containsExactly(
             PathFragment.create("out/foo/bar"), "/dir/file",
@@ -116,7 +116,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", IGNORE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", IGNORE);
     assertThat(manifest.getEntries())
         .containsExactly(PathFragment.create("out/foo/bar"), "/some");
   }
@@ -134,7 +134,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", IGNORE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", IGNORE);
     assertThat(manifest.getEntries()).containsExactly(PathFragment.create("out/foo/bar"), null);
   }
 
@@ -150,7 +150,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     try {
-      FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", IGNORE);
+      FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", IGNORE);
       fail();
     } catch (IOException e) {
       assertThat(e)
@@ -173,7 +173,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     try {
-      FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", ERROR);
+      FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", ERROR);
       fail();
     } catch (IOException e) {
       assertThat(e).hasMessageThat().isEqualTo("runfiles target is not absolute: foo");
@@ -194,7 +194,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", IGNORE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", IGNORE);
     assertThat(manifest.getEntries())
         .containsExactly(PathFragment.create("out/foo/foo"), "/foo/bar");
   }
@@ -213,7 +213,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", RESOLVE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", RESOLVE);
     assertThat(manifest.getEntries())
         .containsExactly(
             PathFragment.create("out/foo/bar"), "/foo/bar",
@@ -234,7 +234,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", RESOLVE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", RESOLVE);
     assertThat(manifest.getEntries())
         .containsExactly(
             PathFragment.create("out/foo/bar"), "/foo/bar",
@@ -255,7 +255,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", RESOLVE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", RESOLVE);
     assertThat(manifest.getEntries())
         .containsExactly(
             PathFragment.create("out/foo/bar/bar"), "/foo/bar",
@@ -274,7 +274,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     try {
-      FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", RESOLVE);
+      FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", RESOLVE);
       fail();
     } catch (IOException e) {
       assertThat(e).hasMessageThat()
@@ -299,7 +299,7 @@ public class FilesetManifestTest {
         ArtifactRoot.asDerivedRoot(fs.getPath("/root"), fs.getPath("/root/out"));
     Artifact artifact = new Artifact(fs.getPath("/root/out/foo"), outputRoot);
     FilesetManifest manifest =
-        FilesetManifest.parseManifestFile(artifact, execRoot, "workspace", IGNORE);
+        FilesetManifest.parseManifestFile(artifact.getExecPath(), execRoot, "workspace", IGNORE);
     assertThat(manifest.getEntries())
         .containsExactly(
             PathFragment.create("out/foo/bar"), "/foo/bar");
diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/SpawnBuilder.java b/src/test/java/com/google/devtools/build/lib/exec/util/SpawnBuilder.java
index b98af7ea2a..1c51ca370a 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/util/SpawnBuilder.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/util/SpawnBuilder.java
@@ -54,10 +54,10 @@ public final class SpawnBuilder {
         ImmutableList.copyOf(args),
         ImmutableMap.copyOf(environment),
         ImmutableMap.copyOf(executionInfo),
-        /*runfilesSupplier=*/EmptyRunfilesSupplier.INSTANCE, 
+        /*runfilesSupplier=*/ EmptyRunfilesSupplier.INSTANCE,
+        ImmutableMap.of(),
         ImmutableList.copyOf(inputs),
-        /*tools=*/ImmutableList.<Artifact>of(),
-        /*filesetManifests=*/ImmutableList.<Artifact>of(),
+        /*tools=*/ ImmutableList.<Artifact>of(),
         ImmutableList.copyOf(outputs),
         ResourceSet.ZERO);
   }
diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java
index 1e52b0bbbe..c6758c185d 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java
@@ -173,7 +173,7 @@ public class GrpcRemoteExecutionClientTest {
         @Override
         public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException {
           return new SpawnInputExpander(execRoot, /*strict*/ false)
-              .getInputMapping(simpleSpawn, SIMPLE_ARTIFACT_EXPANDER, fakeFileCache, "workspace");
+              .getInputMapping(simpleSpawn, SIMPLE_ARTIFACT_EXPANDER, fakeFileCache);
         }
 
         @Override
diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java
index 5304562f99..997d3dc67d 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java
@@ -141,7 +141,7 @@ public class RemoteSpawnCacheTest {
         @Override
         public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException {
           return new SpawnInputExpander(execRoot, /*strict*/ false)
-              .getInputMapping(simpleSpawn, SIMPLE_ARTIFACT_EXPANDER, fakeFileCache, "workspace");
+              .getInputMapping(simpleSpawn, SIMPLE_ARTIFACT_EXPANDER, fakeFileCache);
         }
 
         @Override
diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
index ebf3f5a0d0..3c8293a0f5 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
@@ -968,7 +968,7 @@ public class RemoteSpawnRunnerTest {
     @Override
     public SortedMap<PathFragment, ActionInput> getInputMapping() throws IOException {
       return new SpawnInputExpander(execRoot, /*strict*/ false)
-          .getInputMapping(spawn, artifactExpander, fakeFileCache, "workspace");
+          .getInputMapping(spawn, artifactExpander, fakeFileCache);
     }
 
     @Override
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
index 75d05ce460..9408edab41 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
@@ -115,7 +115,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase {
   private ActionExecutionContext makeDummyContext() {
     DummyExecutor executor = new DummyExecutor(fileSystem, rootDirectory);
     return new ActionExecutionContext(
-        executor, null, null, null, null, null, ImmutableMap.of(), null);
+        executor, null, null, null, null, null, ImmutableMap.of(), ImmutableMap.of(), null);
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
index dbf62828a2..59fd9bfbae 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
@@ -87,6 +87,7 @@ public class LtoBackendActionTest extends BuildViewTestCase {
             null,
             new FileOutErr(),
             ImmutableMap.<String, String>of(),
+            ImmutableMap.of(),
             null);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index 88d1babc68..d12ce09c2e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -743,6 +743,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
             null,
             null,
             ImmutableMap.<String, String>of(),
+            ImmutableMap.of(),
             DUMMY_ARTIFACT_EXPANDER);
     ByteArrayOutputStream moduleMapStream = new ByteArrayOutputStream();
     ByteArrayOutputStream umbrellaHeaderStream = new ByteArrayOutputStream();
@@ -792,6 +793,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
             null,
             null,
             ImmutableMap.<String, String>of(),
+            ImmutableMap.of(),
             DUMMY_ARTIFACT_EXPANDER);
 
     ByteArrayOutputStream moduleMapStream = new ByteArrayOutputStream();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
index 2fa5749af0..96fd9fc9eb 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
@@ -376,9 +376,7 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase {
         throw new IllegalStateException(e);
       }
       return new ActionExecutionValue(
-          artifactData,
-          treeArtifactData,
-          additionalOutputData);
+          artifactData, treeArtifactData, additionalOutputData, /*outputSymlinks=*/ null);
     }
 
     @Override
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
index 014ba2a200..261692338a 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
@@ -740,7 +740,8 @@ public class FilesystemValueCheckerTest {
     return new ActionExecutionValue(
         artifactData,
         ImmutableMap.<Artifact, TreeArtifactValue>of(),
-        ImmutableMap.<Artifact, FileArtifactValue>of());
+        ImmutableMap.<Artifact, FileArtifactValue>of(),
+        /*outputSymlinks=*/ null);
   }
 
   private ActionExecutionValue actionValueWithEmptyDirectory(Artifact emptyDir) {
@@ -750,7 +751,8 @@ public class FilesystemValueCheckerTest {
     return new ActionExecutionValue(
         ImmutableMap.<Artifact, FileValue>of(),
         ImmutableMap.of(emptyDir, emptyValue),
-        ImmutableMap.<Artifact, FileArtifactValue>of());
+        ImmutableMap.<Artifact, FileArtifactValue>of(),
+        /*outputSymlinks=*/ null);
   }
 
   private ActionExecutionValue actionValueWithTreeArtifacts(List<TreeFileArtifact> contents) {
@@ -779,8 +781,11 @@ public class FilesystemValueCheckerTest {
       treeArtifactData.put(dirDatum.getKey(), TreeArtifactValue.create(dirDatum.getValue()));
     }
 
-    return new ActionExecutionValue(fileData, treeArtifactData,
-        ImmutableMap.<Artifact, FileArtifactValue>of());
+    return new ActionExecutionValue(
+        fileData,
+        treeArtifactData,
+        ImmutableMap.<Artifact, FileArtifactValue>of(),
+        /*outputSymlinks=*/ null);
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
index 47ca57b142..54a9302f46 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
@@ -274,7 +274,8 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase {
       return new ActionExecutionValue(
           fileData,
           ImmutableMap.of(output, treeArtifactValue),
-          ImmutableMap.<Artifact, FileArtifactValue>of());
+          ImmutableMap.<Artifact, FileArtifactValue>of(),
+          /*outputSymlinks=*/ null);
     }
 
     @Override
diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index 6a46b8832e..04d416be01 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -191,6 +191,7 @@ public class StandaloneSpawnStrategyTest {
         null,
         outErr,
         ImmutableMap.<String, String>of(),
+        ImmutableMap.of(),
         SIMPLE_ARTIFACT_EXPANDER);
   }