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 | 15 |
1 files changed, 9 insertions, 6 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 546a0e2575..2d80c522f5 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 @@ -73,13 +73,11 @@ import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.SkyFunction.Environment; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; - import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Logger; - import javax.annotation.Nullable; /** @@ -430,7 +428,8 @@ 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 boolean getWorkspaceStatusValues(Environment env, BuildConfiguration config) { + private static boolean getWorkspaceStatusValues(Environment env, BuildConfiguration config) + throws InterruptedException { env.getValue(WorkspaceStatusValue.SKY_KEY); Map<BuildInfoKey, BuildInfoFactory> buildInfoFactories = PrecomputedValue.BUILD_INFO_FACTORIES.get(env); @@ -451,9 +450,13 @@ public final class SkyframeBuildView { /** Returns null if any build-info values are not ready. */ @Nullable - CachingAnalysisEnvironment createAnalysisEnvironment(ArtifactOwner owner, - boolean isSystemEnv, EventHandler eventHandler, - Environment env, BuildConfiguration config) { + CachingAnalysisEnvironment createAnalysisEnvironment( + ArtifactOwner owner, + boolean isSystemEnv, + EventHandler eventHandler, + Environment env, + BuildConfiguration config) + throws InterruptedException { if (config != null && !getWorkspaceStatusValues(env, config)) { return null; } |