diff options
| author |  Googler <noreply@google.com> | 2017-07-25 20:39:39 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-26 10:34:55 +0200 |
| commit | 8ab04a17f350aa822aabd8b0ed8a3679471a393a (patch) | |
| tree | b96e04a3666d383c76930c186d55fd2da2310ef9 /src | |
| parent | 35209cf28e47f9e11055756407b18e56507ea17a (diff) | |
BEP: Report AbortedEvent with SKIPPED status for targets with incompatible CPU constraints.
PiperOrigin-RevId: 163100038
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto index 1c54a6ed6e..8f2aec9815 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto @@ -198,6 +198,9 @@ message Aborted { // A Failure occurred in the analysis phase of a target. ANALYSIS_FAILURE = 6; + + // Target build was skipped (e.g. due to incompatible CPU constraints). + SKIPPED = 7; } AbortReason reason = 1; 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 a65c0ae6e0..37220e22f9 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 @@ -33,6 +33,8 @@ import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollectio 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.BuildEventStreamProtos.Aborted.AbortReason; import com.google.devtools.build.lib.buildtool.BuildRequest.BuildRequestOptions; import com.google.devtools.build.lib.buildtool.buildevent.BuildCompleteEvent; import com.google.devtools.build.lib.buildtool.buildevent.BuildInterruptedEvent; @@ -209,6 +211,13 @@ public final class BuildTool { reportTargets(analysisResult); + for (ConfiguredTarget target : analysisResult.getTargetsToSkip()) { + BuildConfiguration config = target.getConfiguration(); + env.getEventBus().post(new AbortedEvent(config.getEventId(), AbortReason.SKIPPED, + String.format( + "Target %s build was skipped.", target.getLabel()))); + } + // Execution phase. if (needsExecutionPhase(request.getBuildOptions())) { executionTool.executeBuild( |