BEP: correctly report AliasConfiguredTargets When reporting the completion of a target specified by an alias, report the label of the alias, not that of the target being aliased to. Change-Id: If8416ceef73b01b7531ffa0012251f25a4e9f062 PiperOrigin-RevId: 170466076
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 d7828f9..5b6b267 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
@@ -43,6 +43,7 @@ import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.TestSize; +import com.google.devtools.build.lib.rules.AliasConfiguredTarget; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.skyframe.SkyValue; @@ -134,10 +135,14 @@ @Override public BuildEventId getEventId() { + Label label = getTarget().getLabel(); + if (target instanceof AliasConfiguredTarget) { + label = ((AliasConfiguredTarget) target).getOriginalLabel(); + } BuildConfiguration config = getTarget().getConfiguration(); BuildEventId configId = config == null ? BuildEventId.nullConfigurationId() : config.getEventId(); - return BuildEventId.targetCompleted(getTarget().getLabel(), configId); + return BuildEventId.targetCompleted(label, configId); } @Override