aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2015-09-25 22:33:55 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-09-28 11:39:44 +0000
commit7b51b1a32d35ab3a056475e6e0c0765c32cd3c99 (patch)
tree76ddf4dc55e4b8a3095647e7acaef9cdf680265e /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
parent5735ff9978ff1d2cbde994b9d7c9516a9a331e5b (diff)
Inject an event handler into the getErrorFreeVisitedPackages call.
This means we no longer need an event handler on the object itself. -- MOS_MIGRATED_REVID=103982299
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
index f325dc3ba3..1315fcf60d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
@@ -56,7 +56,7 @@ final class SkyframeLabelVisitor implements TransitivePackageLoader {
private Set<PackageIdentifier> errorFreeVisitedPackages;
private Set<Label> visitedTargets;
private Set<TransitiveTargetValue> previousBuildTargetValueSet = null;
- private boolean lastBuildKeepGoing = false;
+ private boolean lastBuildKeepGoing;
private final Multimap<Label, Label> rootCauses = HashMultimap.create();
SkyframeLabelVisitor(SkyframeTransitivePackageLoader transitivePackageLoader,
@@ -229,15 +229,14 @@ final class SkyframeLabelVisitor implements TransitivePackageLoader {
previousBuildTargetValueSet = currentBuildTargetValueSet;
}
-
@Override
public Set<PackageIdentifier> getVisitedPackageNames() {
return allVisitedPackages;
}
@Override
- public Set<Package> getErrorFreeVisitedPackages() {
- return transitivePackageLoader.retrievePackages(errorFreeVisitedPackages);
+ public Set<Package> getErrorFreeVisitedPackages(EventHandler eventHandler) {
+ return transitivePackageLoader.retrievePackages(eventHandler, errorFreeVisitedPackages);
}
/**