diff options
Diffstat (limited to 'src/main/java/com/google')
3 files changed, 19 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java index de67b6c974..fa6feffba4 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildInfoEvent.java @@ -16,16 +16,16 @@ package com.google.devtools.build.lib.analysis; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.buildeventstream.BuildEvent; import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; +import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; import java.util.Collection; import java.util.Map; /** This event is fired once build info data is available. */ -public final class BuildInfoEvent implements BuildEvent { +public final class BuildInfoEvent implements BuildEventWithOrderConstraint { private final Map<String, String> buildInfoMap; /** @@ -53,6 +53,11 @@ public final class BuildInfoEvent implements BuildEvent { } @Override + public Collection<BuildEventId> postedAfter() { + return ImmutableList.<BuildEventId>of(BuildEventId.buildStartedId()); + } + + @Override public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { BuildEventStreamProtos.WorkspaceStatus.Builder status = BuildEventStreamProtos.WorkspaceStatus.newBuilder(); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java index ecad21968d..1a597212b8 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java @@ -72,6 +72,11 @@ public final class TargetCompleteEvent (rootCauses == null) ? NestedSetBuilder.<Cause>emptySet(Order.STABLE_ORDER) : rootCauses; ImmutableList.Builder<BuildEventId> postedAfterBuilder = ImmutableList.builder(); + Label label = getTarget().getLabel(); + if (target instanceof AliasConfiguredTarget) { + label = ((AliasConfiguredTarget) target).getOriginalLabel(); + } + postedAfterBuilder.add(BuildEventId.targetConfigured(label)); for (Cause cause : getRootCauses()) { postedAfterBuilder.add(BuildEventId.fromCause(cause)); } diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java index 64d4eb1f1e..b2eb9433e1 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java @@ -17,10 +17,10 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.devtools.build.lib.buildeventstream.BuildEvent; import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; import com.google.devtools.build.lib.buildeventstream.BuildEventId; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; +import com.google.devtools.build.lib.buildeventstream.BuildEventWithOrderConstraint; import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Target; @@ -29,7 +29,7 @@ import java.util.Collection; import java.util.List; /** This event is fired just after target pattern evaluation is completed. */ -public class TargetParsingCompleteEvent implements BuildEvent { +public class TargetParsingCompleteEvent implements BuildEventWithOrderConstraint { private final ImmutableList<String> originalTargetPattern; private final ImmutableSet<Target> targets; @@ -96,6 +96,11 @@ public class TargetParsingCompleteEvent implements BuildEvent { } @Override + public Collection<BuildEventId> postedAfter() { + return ImmutableList.<BuildEventId>of(BuildEventId.buildStartedId()); + } + + @Override public Collection<BuildEventId> getChildrenEvents() { ImmutableList.Builder<BuildEventId> childrenBuilder = ImmutableList.builder(); for (Target target : expandedTargets) { |