aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-09-18 12:18:03 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-09-18 14:08:52 +0200
commite002c86697a60ef7a4fbde1b34ca52bb22594894 (patch)
treefe378afc015c2b4599b4be5807227b7e7eb81f2e /src/main/java/com/google/devtools/build
parent137bb34a721b12a60da91b1e22083480a04990e7 (diff)
Fix BEP to report SKIPPED with TargetCompletedId instead of ConfigurationId
PiperOrigin-RevId: 169067125
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r--src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index 777c9e8dbc..6f0d2fbb0e 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -34,6 +34,7 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.config.DefaultsPackage;
import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
import com.google.devtools.build.lib.buildeventstream.AbortedEvent;
+import com.google.devtools.build.lib.buildeventstream.BuildEventId;
import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.Aborted.AbortReason;
import com.google.devtools.build.lib.buildtool.BuildRequest.BuildRequestOptions;
import com.google.devtools.build.lib.buildtool.buildevent.BuildCompleteEvent;
@@ -220,8 +221,11 @@ public final class BuildTool {
for (ConfiguredTarget target : analysisResult.getTargetsToSkip()) {
BuildConfiguration config = target.getConfiguration();
Label label = target.getLabel();
- env.getEventBus().post(new AbortedEvent(config.getEventId(), AbortReason.SKIPPED,
- String.format("Target %s build was skipped.", label), label));
+ env.getEventBus().post(
+ new AbortedEvent(
+ BuildEventId.targetCompleted(label, config.getEventId()),
+ AbortReason.SKIPPED,
+ String.format("Target %s build was skipped.", label), label));
}
// TODO(janakr): this query will operate over the graph as constructed by analysis, but will