aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2016-01-27 12:56:15 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-01-27 15:09:52 +0000
commit2dc9508ec8d41dba9d897c2de61468bb9600dfbf (patch)
treeb6943fced32a956b3d09b578633ddd849d7e4365 /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java
parent298d32dd5cb7bac5c44066c38d053493c99a3423 (diff)
Fix: return an error from the analysis phase with keep_going in error cases.
- if there are failed top-level aspects - if there are conflicting actions I ended up rewriting how errors are signaled from the SkyframeBuildView. I think this is safe, but please review carefully. -- MOS_MIGRATED_REVID=113150100
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java
index 7db9ca2efe..371ba8ff88 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java
@@ -26,22 +26,29 @@ import java.util.Collection;
* Encapsulates the raw analysis result of top level targets and aspects coming from Skyframe.
*/
public class SkyframeAnalysisResult {
+ private final boolean hasError;
private final ImmutableList<ConfiguredTarget> configuredTargets;
private final WalkableGraph walkableGraph;
private final ImmutableList<AspectValue> aspects;
private final ImmutableMap<PackageIdentifier, Path> packageRoots;
public SkyframeAnalysisResult(
+ boolean hasError,
ImmutableList<ConfiguredTarget> configuredTargets,
WalkableGraph walkableGraph,
ImmutableList<AspectValue> aspects,
ImmutableMap<PackageIdentifier, Path> packageRoots) {
+ this.hasError = hasError;
this.configuredTargets = configuredTargets;
this.walkableGraph = walkableGraph;
this.aspects = aspects;
this.packageRoots = packageRoots;
}
+ public boolean hasError() {
+ return hasError;
+ }
+
public Collection<ConfiguredTarget> getConfiguredTargets() {
return configuredTargets;
}