1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java
index f8e419e65f..936aeb12a5 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/buildevent/BuildCompleteEvent.java
@@ -60,9 +60,15 @@ public final class BuildCompleteEvent implements BuildEvent {
 
   @Override
   public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) {
+    BuildEventStreamProtos.BuildFinished.ExitCode exitCode =
+        BuildFinished.ExitCode.newBuilder()
+            .setName(result.getExitCondition().name())
+            .setCode(result.getExitCondition().getNumericExitCode())
+            .build();
+
     BuildFinished finished =
         BuildFinished.newBuilder()
-            .setOverallSuccess(result.getSuccess())
+            .setExitCode(exitCode)
             .setFinishTimeMillis(result.getStopTime())
             .build();
     return GenericBuildEvent.protoChaining(this).setFinished(finished).build();