Remove all references to (incorrect) BlazeDirectories.buildDataDirectory root

The buildDataDirectory is calculated off of the incorrect execroot.

More progress towards #1681.

--
MOS_MIGRATED_REVID=131407798

2 files changed, 6 insertions, 16 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 7361c1f564..652fc820e4 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
@@ -36,12 +36,9 @@ import java.util.Map;
 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 Root buildDataDirectory;
 
-  BuildInfoCollectionFunction(Supplier<ArtifactFactory> artifactFactory,
-      Root buildDataDirectory) {
+  BuildInfoCollectionFunction(Supplier<ArtifactFactory> artifactFactory) {
     this.artifactFactory = artifactFactory;
-    this.buildDataDirectory = buildDataDirectory;
   }
 
   @Override
@@ -66,11 +63,6 @@ public class BuildInfoCollectionFunction implements SkyFunction {
             ? factory.getConstantMetadataArtifact(rootRelativePath, root, keyAndConfig)
             : factory.getDerivedArtifact(rootRelativePath, root, keyAndConfig);
       }
-
-      @Override
-      public Root getBuildDataDirectory() {
-        return buildDataDirectory;
-      }
     };
 
     return new BuildInfoCollectionValue(buildInfoFactories.get(
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 8ee75f1593..bc358f8a03 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -322,7 +322,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   }
 
   private ImmutableMap<SkyFunctionName, SkyFunction> skyFunctions(
-      Root buildDataDirectory,
       PackageFactory pkgFactory,
       Predicate<PathFragment> allowedMissingInputs) {
     ConfiguredRuleClassProvider ruleClassProvider =
@@ -398,8 +397,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     map.put(SkyFunctions.ASPECT_COMPLETION, CompletionFunction.aspectCompletionFunction(eventBus));
     map.put(SkyFunctions.TEST_COMPLETION, new TestCompletionFunction());
     map.put(SkyFunctions.ARTIFACT, new ArtifactFunction(allowedMissingInputs));
-    map.put(SkyFunctions.BUILD_INFO_COLLECTION, new BuildInfoCollectionFunction(artifactFactory,
-        buildDataDirectory));
+    map.put(SkyFunctions.BUILD_INFO_COLLECTION, new BuildInfoCollectionFunction(artifactFactory));
     map.put(SkyFunctions.BUILD_INFO, new WorkspaceStatusFunction());
     map.put(SkyFunctions.COVERAGE_REPORT, new CoverageReportFunction());
     ActionExecutionFunction actionExecutionFunction =
@@ -529,7 +527,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   protected void init() {
     progressReceiver = newSkyframeProgressReceiver();
     ImmutableMap<SkyFunctionName, SkyFunction> skyFunctions =
-        skyFunctions(directories.getBuildDataDirectory(), pkgFactory, allowedMissingInputs);
+        skyFunctions(pkgFactory, allowedMissingInputs);
     memoizingEvaluator = evaluatorSupplier.create(
         skyFunctions, evaluatorDiffer(), progressReceiver, emittedEventState,
         hasIncrementalState());
@@ -621,10 +619,10 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     PrecomputedValue.DEFAULTS_PACKAGE_CONTENTS.set(injectable(), defaultsPackageContents);
   }
 
-  public void injectWorkspaceStatusData() {
+  public void injectWorkspaceStatusData(String workspaceName) {
     PrecomputedValue.WORKSPACE_STATUS_KEY.set(injectable(),
         workspaceStatusActionFactory.createWorkspaceStatusAction(
-            artifactFactory.get(), WorkspaceStatusValue.ARTIFACT_OWNER, buildId));
+            artifactFactory.get(), WorkspaceStatusValue.ARTIFACT_OWNER, buildId, workspaceName));
   }
 
   public void injectCoverageReportData(ImmutableList<ActionAnalysisMetadata> actions) {
@@ -1376,7 +1374,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
       EventHandler eventHandler, Label label, BuildConfiguration configuration) {
     if (memoizingEvaluator.getExistingValueForTesting(
         PrecomputedValue.WORKSPACE_STATUS_KEY.getKeyForTesting()) == null) {
-      injectWorkspaceStatusData();
+      injectWorkspaceStatusData(label.getWorkspaceRoot());
     }
 
     Dependency dep;