diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java index ff5dc00884..7e6b7acae8 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java @@ -434,14 +434,12 @@ public final class SkyframeBuildView { */ // TODO(bazel-team): Allow analysis to return null so the value builder can exit and wait for a // restart deps are not present. - private static boolean getWorkspaceStatusValues(Environment env, BuildConfiguration config) + private static boolean getWorkspaceStatusValues( + Environment env, + BuildConfiguration config, + ImmutableMap<BuildInfoKey, BuildInfoFactory> buildInfoFactories) throws InterruptedException { env.getValue(WorkspaceStatusValue.SKY_KEY); - Map<BuildInfoKey, BuildInfoFactory> buildInfoFactories = - PrecomputedValue.BUILD_INFO_FACTORIES.get(env); - if (buildInfoFactories == null) { - return false; - } // These factories may each create their own build info artifacts, all depending on the basic // build-info.txt and build-changelist.txt. List<SkyKey> depKeys = Lists.newArrayList(); @@ -463,7 +461,8 @@ public final class SkyframeBuildView { Environment env, BuildConfiguration config) throws InterruptedException { - if (config != null && !getWorkspaceStatusValues(env, config)) { + if (config != null + && !getWorkspaceStatusValues(env, config, skyframeExecutor.getBuildInfoFactories())) { return null; } boolean extendedSanityChecks = config != null && config.extendedSanityChecks(); |