diff options
author | Kristina Chodorow <kchodorow@google.com> | 2016-08-26 16:14:37 +0000 |
---|---|---|
committer | John Cater <jcater@google.com> | 2016-08-26 18:42:42 +0000 |
commit | 8cb36d6bee170da857df3e50e72c8dcfceb5b7ff (patch) | |
tree | 9c9310435370714bd3be073cc6317d93883e2e23 /src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java | |
parent | 4c10f3f86f7a0530e83d4b2062b48676afafe2c0 (diff) |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionFunction.java | 10 |
1 files changed, 1 insertions, 9 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( |