BEP: report configurations for targets
In multi-architecture builds, a target might be built several times,
for the different architectures. Make the target completion events for
those distinguishable by indicating the architecture for which the target
was built. Also add the needed event for the expansion of a target to
target-configuration pairs.
Change-Id: I95ef2c81166077163dd686db4671f672160efe1d
PiperOrigin-RevId: 155491076
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 f296202..f28713f 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
@@ -20,6 +20,8 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.EventReportingArtifacts;
import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper.ArtifactsInOutputGroup;
+import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
+import com.google.devtools.build.lib.analysis.config.BuildEventWithConfiguration;
import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer;
import com.google.devtools.build.lib.buildeventstream.BuildEventConverters;
import com.google.devtools.build.lib.buildeventstream.BuildEventId;
@@ -43,8 +45,10 @@
/** This event is fired as soon as a target is either built or fails. */
public final class TargetCompleteEvent
- implements SkyValue, BuildEventWithOrderConstraint, EventReportingArtifacts {
-
+ implements SkyValue,
+ BuildEventWithOrderConstraint,
+ EventReportingArtifacts,
+ BuildEventWithConfiguration {
private final ConfiguredTarget target;
private final NestedSet<Cause> rootCauses;
private final Collection<BuildEventId> postedAfter;
@@ -111,7 +115,8 @@
@Override
public BuildEventId getEventId() {
- return BuildEventId.targetCompleted(getTarget().getLabel());
+ return BuildEventId.targetCompleted(
+ getTarget().getLabel(), getTarget().getConfiguration().getEventId());
}
@Override
@@ -177,6 +182,16 @@
return builder.build();
}
+ @Override
+ public Collection<BuildConfiguration> getConfigurations() {
+ BuildConfiguration configuration = target.getConfiguration();
+ if (configuration != null) {
+ return ImmutableList.of(target.getConfiguration());
+ } else {
+ return ImmutableList.<BuildConfiguration>of();
+ }
+ }
+
private Iterable<String> getTags() {
// We are only interested in targets that are rules.
if (!(target instanceof RuleConfiguredTarget)) {
