Remove BuildInfoFactory precomputed value.

PiperOrigin-RevId: 169728184

1 files changed, 6 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
index 79011a82a9..6fcd4c65e3 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ArtifactFactory;
 import com.google.devtools.build.lib.actions.Root;
@@ -28,7 +29,6 @@ import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import java.util.Map;
 
 /**
  * Creates a {@link BuildInfoCollectionValue}. Only depends on the unique
@@ -39,10 +39,14 @@ public class BuildInfoCollectionFunction implements SkyFunction {
   // Supplier only because the artifact factory has not yet been created at constructor time.
   private final Supplier<ArtifactFactory> artifactFactory;
   private final Supplier<Boolean> removeActionsAfterEvaluation;
+  private final ImmutableMap<BuildInfoKey, BuildInfoFactory> buildInfoFactories;
 
   BuildInfoCollectionFunction(
-      Supplier<ArtifactFactory> artifactFactory, Supplier<Boolean> removeActionsAfterEvaluation) {
+      Supplier<ArtifactFactory> artifactFactory,
+      ImmutableMap<BuildInfoKey, BuildInfoFactory> buildInfoFactories,
+      Supplier<Boolean> removeActionsAfterEvaluation) {
     this.artifactFactory = artifactFactory;
+    this.buildInfoFactories = buildInfoFactories;
     this.removeActionsAfterEvaluation = Preconditions.checkNotNull(removeActionsAfterEvaluation);
   }
 
@@ -54,11 +58,6 @@ public class BuildInfoCollectionFunction implements SkyFunction {
     if (infoArtifactValue == null) {
       return null;
     }
-    Map<BuildInfoKey, BuildInfoFactory> buildInfoFactories =
-        PrecomputedValue.BUILD_INFO_FACTORIES.get(env);
-    if (buildInfoFactories == null) {
-      return null;
-    }
     WorkspaceNameValue nameValue = (WorkspaceNameValue) env.getValue(WorkspaceNameValue.key());
     if (nameValue == null) {
       return null;