Merge "Update ninja proto, always enable `ninja -d stats`" (7b7aa8c3) · Commits · e / os / android_build_soong

ui/build/ninja.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ func runNinja(ctx Context, config Config) {
		args := []string{
		"-d", "keepdepfile",
		"-d", "keeprsp",
		"-d", "stats",
		"--frontend_file", fifo,
		}

ui/build/soong.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@ func runSoong(ctx Context, config Config) {
		cmd := Command(ctx, config, "soong "+name,
		config.PrebuiltBuildTool("ninja"),
		"-d", "keepdepfile",
		"-d", "stats",
		"-o", "usesphonyoutputs=yes",
		"-o", "preremoveoutputs=yes",
		"-w", "dupbuild=err",

ui/status/ninja.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,8 @@ func (n *NinjaReader) run() {
		n.status.Print("warning: " + message)
		case ninja_frontend.Status_Message_ERROR:
		n.status.Error(message)
		case ninja_frontend.Status_Message_DEBUG:
		n.status.Verbose(message)
		default:
		n.status.Print(message)
		}

ui/status/ninja_frontend/frontend.pb.go

+103 −64

Original line number	Diff line number	Diff line
		@@ -3,9 +3,11 @@

		package ninja_frontend

		import proto "github.com/golang/protobuf/proto"
		import fmt "fmt"
		import math "math"
		import (
		fmt "fmt"
		proto "github.com/golang/protobuf/proto"
		math "math"
		)

		// Reference imports to suppress errors if they are not otherwise used.
		var _ = proto.Marshal
		@@ -16,7 +18,7 @@ var _ = math.Inf
		// is compatible with the proto package it is being compiled against.
		// A compilation error at this line likely means your copy of the
		// proto package needs to be updated.
		const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
		const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package

		type Status_Message_Level int32

		@@ -24,17 +26,21 @@ const (
		Status_Message_INFO Status_Message_Level = 0
		Status_Message_WARNING Status_Message_Level = 1
		Status_Message_ERROR Status_Message_Level = 2
		Status_Message_DEBUG Status_Message_Level = 3
		)

		var Status_Message_Level_name = map[int32]string{
		0: "INFO",
		1: "WARNING",
		2: "ERROR",
		3: "DEBUG",
		}

		var Status_Message_Level_value = map[string]int32{
		"INFO": 0,
		"WARNING": 1,
		"ERROR": 2,
		"DEBUG": 3,
		}

		func (x Status_Message_Level) Enum() *Status_Message_Level {
		@@ -42,9 +48,11 @@ func (x Status_Message_Level) Enum() *Status_Message_Level {
		*p = x
		return p
		}

		func (x Status_Message_Level) String() string {
		return proto.EnumName(Status_Message_Level_name, int32(x))
		}

		func (x *Status_Message_Level) UnmarshalJSON(data []byte) error {
		value, err := proto.UnmarshalJSONEnum(Status_Message_Level_value, data, "Status_Message_Level")
		if err != nil {
		@@ -53,8 +61,9 @@ func (x *Status_Message_Level) UnmarshalJSON(data []byte) error {
		*x = Status_Message_Level(value)
		return nil
		}

		func (Status_Message_Level) EnumDescriptor() ([]byte, []int) {
		return fileDescriptor_frontend_5a49d9b15a642005, []int{0, 5, 0}
		return fileDescriptor_eca3873955a29cfe, []int{0, 5, 0}
		}

		type Status struct {
		@@ -73,16 +82,17 @@ func (m Status) Reset() { m = Status{} }
		func (m *Status) String() string { return proto.CompactTextString(m) }
		func (*Status) ProtoMessage() {}
		func (*Status) Descriptor() ([]byte, []int) {
		return fileDescriptor_frontend_5a49d9b15a642005, []int{0}
		return fileDescriptor_eca3873955a29cfe, []int{0}
		}

		func (m *Status) XXX_Unmarshal(b []byte) error {
		return xxx_messageInfo_Status.Unmarshal(m, b)
		}
		func (m *Status) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
		return xxx_messageInfo_Status.Marshal(b, m, deterministic)
		}
		func (dst *Status) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status.Merge(dst, src)
		func (m *Status) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status.Merge(m, src)
		}
		func (m *Status) XXX_Size() int {
		return xxx_messageInfo_Status.Size(m)
		@@ -147,16 +157,17 @@ func (m Status_TotalEdges) Reset() { m = Status_TotalEdges{} }
		func (m *Status_TotalEdges) String() string { return proto.CompactTextString(m) }
		func (*Status_TotalEdges) ProtoMessage() {}
		func (*Status_TotalEdges) Descriptor() ([]byte, []int) {
		return fileDescriptor_frontend_5a49d9b15a642005, []int{0, 0}
		return fileDescriptor_eca3873955a29cfe, []int{0, 0}
		}

		func (m *Status_TotalEdges) XXX_Unmarshal(b []byte) error {
		return xxx_messageInfo_Status_TotalEdges.Unmarshal(m, b)
		}
		func (m *Status_TotalEdges) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
		return xxx_messageInfo_Status_TotalEdges.Marshal(b, m, deterministic)
		}
		func (dst *Status_TotalEdges) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_TotalEdges.Merge(dst, src)
		func (m *Status_TotalEdges) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_TotalEdges.Merge(m, src)
		}
		func (m *Status_TotalEdges) XXX_Size() int {
		return xxx_messageInfo_Status_TotalEdges.Size(m)
		@@ -188,16 +199,17 @@ func (m Status_BuildStarted) Reset() { m = Status_BuildStarted{} }
		func (m *Status_BuildStarted) String() string { return proto.CompactTextString(m) }
		func (*Status_BuildStarted) ProtoMessage() {}
		func (*Status_BuildStarted) Descriptor() ([]byte, []int) {
		return fileDescriptor_frontend_5a49d9b15a642005, []int{0, 1}
		return fileDescriptor_eca3873955a29cfe, []int{0, 1}
		}

		func (m *Status_BuildStarted) XXX_Unmarshal(b []byte) error {
		return xxx_messageInfo_Status_BuildStarted.Unmarshal(m, b)
		}
		func (m *Status_BuildStarted) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
		return xxx_messageInfo_Status_BuildStarted.Marshal(b, m, deterministic)
		}
		func (dst *Status_BuildStarted) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_BuildStarted.Merge(dst, src)
		func (m *Status_BuildStarted) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_BuildStarted.Merge(m, src)
		}
		func (m *Status_BuildStarted) XXX_Size() int {
		return xxx_messageInfo_Status_BuildStarted.Size(m)
		@@ -232,16 +244,17 @@ func (m Status_BuildFinished) Reset() { m = Status_BuildFinished{} }
		func (m *Status_BuildFinished) String() string { return proto.CompactTextString(m) }
		func (*Status_BuildFinished) ProtoMessage() {}
		func (*Status_BuildFinished) Descriptor() ([]byte, []int) {
		return fileDescriptor_frontend_5a49d9b15a642005, []int{0, 2}
		return fileDescriptor_eca3873955a29cfe, []int{0, 2}
		}

		func (m *Status_BuildFinished) XXX_Unmarshal(b []byte) error {
		return xxx_messageInfo_Status_BuildFinished.Unmarshal(m, b)
		}
		func (m *Status_BuildFinished) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
		return xxx_messageInfo_Status_BuildFinished.Marshal(b, m, deterministic)
		}
		func (dst *Status_BuildFinished) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_BuildFinished.Merge(dst, src)
		func (m *Status_BuildFinished) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_BuildFinished.Merge(m, src)
		}
		func (m *Status_BuildFinished) XXX_Size() int {
		return xxx_messageInfo_Status_BuildFinished.Size(m)
		@@ -276,16 +289,17 @@ func (m Status_EdgeStarted) Reset() { m = Status_EdgeStarted{} }
		func (m *Status_EdgeStarted) String() string { return proto.CompactTextString(m) }
		func (*Status_EdgeStarted) ProtoMessage() {}
		func (*Status_EdgeStarted) Descriptor() ([]byte, []int) {
		return fileDescriptor_frontend_5a49d9b15a642005, []int{0, 3}
		return fileDescriptor_eca3873955a29cfe, []int{0, 3}
		}

		func (m *Status_EdgeStarted) XXX_Unmarshal(b []byte) error {
		return xxx_messageInfo_Status_EdgeStarted.Unmarshal(m, b)
		}
		func (m *Status_EdgeStarted) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
		return xxx_messageInfo_Status_EdgeStarted.Marshal(b, m, deterministic)
		}
		func (dst *Status_EdgeStarted) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_EdgeStarted.Merge(dst, src)
		func (m *Status_EdgeStarted) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_EdgeStarted.Merge(m, src)
		}
		func (m *Status_EdgeStarted) XXX_Size() int {
		return xxx_messageInfo_Status_EdgeStarted.Size(m)
		@@ -354,6 +368,10 @@ type Status_EdgeFinished struct {
		Status *int32 `protobuf:"zigzag32,3,opt,name=status" json:"status,omitempty"`
		// Edge output, may contain ANSI codes.
		Output *string `protobuf:"bytes,4,opt,name=output" json:"output,omitempty"`
		// Number of milliseconds spent executing in user mode
		UserTime *uint32 `protobuf:"varint,5,opt,name=user_time,json=userTime" json:"user_time,omitempty"`
		// Number of milliseconds spent executing in kernel mode
		SystemTime *uint32 `protobuf:"varint,6,opt,name=system_time,json=systemTime" json:"system_time,omitempty"`
		XXX_NoUnkeyedLiteral struct{} `json:"-"`
		XXX_unrecognized []byte `json:"-"`
		XXX_sizecache int32 `json:"-"`
		@@ -363,16 +381,17 @@ func (m Status_EdgeFinished) Reset() { m = Status_EdgeFinished{} }
		func (m *Status_EdgeFinished) String() string { return proto.CompactTextString(m) }
		func (*Status_EdgeFinished) ProtoMessage() {}
		func (*Status_EdgeFinished) Descriptor() ([]byte, []int) {
		return fileDescriptor_frontend_5a49d9b15a642005, []int{0, 4}
		return fileDescriptor_eca3873955a29cfe, []int{0, 4}
		}

		func (m *Status_EdgeFinished) XXX_Unmarshal(b []byte) error {
		return xxx_messageInfo_Status_EdgeFinished.Unmarshal(m, b)
		}
		func (m *Status_EdgeFinished) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
		return xxx_messageInfo_Status_EdgeFinished.Marshal(b, m, deterministic)
		}
		func (dst *Status_EdgeFinished) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_EdgeFinished.Merge(dst, src)
		func (m *Status_EdgeFinished) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_EdgeFinished.Merge(m, src)
		}
		func (m *Status_EdgeFinished) XXX_Size() int {
		return xxx_messageInfo_Status_EdgeFinished.Size(m)
		@@ -411,8 +430,22 @@ func (m *Status_EdgeFinished) GetOutput() string {
		return ""
		}

		func (m *Status_EdgeFinished) GetUserTime() uint32 {
		if m != nil && m.UserTime != nil {
		return *m.UserTime
		}
		return 0
		}

		func (m *Status_EdgeFinished) GetSystemTime() uint32 {
		if m != nil && m.SystemTime != nil {
		return *m.SystemTime
		}
		return 0
		}

		type Status_Message struct {
		// Message priority level (INFO, WARNING, or ERROR).
		// Message priority level (DEBUG, INFO, WARNING, ERROR).
		Level *Status_Message_Level `protobuf:"varint,1,opt,name=level,enum=ninja.Status_Message_Level,def=0" json:"level,omitempty"`
		// Info/warning/error message from Ninja.
		Message *string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
		@@ -425,16 +458,17 @@ func (m Status_Message) Reset() { m = Status_Message{} }
		func (m *Status_Message) String() string { return proto.CompactTextString(m) }
		func (*Status_Message) ProtoMessage() {}
		func (*Status_Message) Descriptor() ([]byte, []int) {
		return fileDescriptor_frontend_5a49d9b15a642005, []int{0, 5}
		return fileDescriptor_eca3873955a29cfe, []int{0, 5}
		}

		func (m *Status_Message) XXX_Unmarshal(b []byte) error {
		return xxx_messageInfo_Status_Message.Unmarshal(m, b)
		}
		func (m *Status_Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
		return xxx_messageInfo_Status_Message.Marshal(b, m, deterministic)
		}
		func (dst *Status_Message) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_Message.Merge(dst, src)
		func (m *Status_Message) XXX_Merge(src proto.Message) {
		xxx_messageInfo_Status_Message.Merge(m, src)
		}
		func (m *Status_Message) XXX_Size() int {
		return xxx_messageInfo_Status_Message.Size(m)
		@@ -462,6 +496,7 @@ func (m *Status_Message) GetMessage() string {
		}

		func init() {
		proto.RegisterEnum("ninja.Status_Message_Level", Status_Message_Level_name, Status_Message_Level_value)
		proto.RegisterType((*Status)(nil), "ninja.Status")
		proto.RegisterType((*Status_TotalEdges)(nil), "ninja.Status.TotalEdges")
		proto.RegisterType((*Status_BuildStarted)(nil), "ninja.Status.BuildStarted")
		@@ -469,42 +504,46 @@ func init() {
		proto.RegisterType((*Status_EdgeStarted)(nil), "ninja.Status.EdgeStarted")
		proto.RegisterType((*Status_EdgeFinished)(nil), "ninja.Status.EdgeFinished")
		proto.RegisterType((*Status_Message)(nil), "ninja.Status.Message")
		proto.RegisterEnum("ninja.Status_Message_Level", Status_Message_Level_name, Status_Message_Level_value)
		}

		func init() { proto.RegisterFile("frontend.proto", fileDescriptor_frontend_5a49d9b15a642005) }

		var fileDescriptor_frontend_5a49d9b15a642005 = []byte{
		// 496 bytes of a gzipped FileDescriptorProto
		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xd1, 0x6e, 0xd3, 0x30,
		0x14, 0xa5, 0x69, 0xd3, 0x34, 0x37, 0x6d, 0x28, 0x96, 0x40, 0x59, 0x10, 0xa2, 0xda, 0xd3, 0x78,
		0x20, 0x48, 0xbc, 0x20, 0x10, 0x12, 0xa2, 0xd2, 0x06, 0x43, 0xd0, 0x49, 0xde, 0x24, 0x24, 0x5e,
		0xaa, 0x74, 0xf6, 0x86, 0x51, 0xe2, 0x54, 0xb1, 0xbb, 0x5f, 0xe0, 0x7f, 0x78, 0xe0, 0xfb, 0x90,
		0xaf, 0xed, 0x2c, 0x65, 0x7b, 0xcb, 0xf1, 0x3d, 0xe7, 0xde, 0x73, 0x8f, 0x1d, 0x48, 0xaf, 0xda,
		0x46, 0x6a, 0x2e, 0x59, 0xb1, 0x6d, 0x1b, 0xdd, 0x90, 0x50, 0x0a, 0xf9, 0xab, 0x3c, 0xfc, 0x13,
		0xc1, 0xf8, 0x5c, 0x97, 0x7a, 0xa7, 0xc8, 0x5b, 0x48, 0x74, 0xa3, 0xcb, 0x6a, 0xcd, 0xd9, 0x35,
		0x57, 0xd9, 0x60, 0x31, 0x38, 0x4a, 0x5e, 0x67, 0x05, 0xf2, 0x0a, 0xcb, 0x29, 0x2e, 0x0c, 0xe1,
		0xd8, 0xd4, 0x29, 0xe8, 0xee, 0x9b, 0x7c, 0x80, 0xd9, 0x66, 0x27, 0x2a, 0xb6, 0x56, 0xba, 0x6c,
		0x35, 0x67, 0x59, 0x80, 0xe2, 0x7c, 0x5f, 0xbc, 0x34, 0x94, 0x73, 0xcb, 0xa0, 0xd3, 0x4d, 0x0f,
		0x91, 0x25, 0xa4, 0xb6, 0xc1, 0x95, 0x90, 0x42, 0xfd, 0xe4, 0x2c, 0x1b, 0x62, 0x87, 0xa7, 0xf7,
		0x74, 0x38, 0x71, 0x14, 0x6a, 0x67, 0x7a, 0x48, 0xde, 0xc3, 0xd4, 0x38, 0xef, 0x3c, 0x8c, 0xb0,
		0xc3, 0xc1, 0x7e, 0x07, 0xe3, 0xd7, 0x5b, 0x48, 0xf8, 0x2d, 0x30, 0x2b, 0xa0, 0xba, 0x33, 0x10,
		0xde, 0xb7, 0x82, 0x91, 0x77, 0xf3, 0x71, 0x5c, 0x37, 0xfe, 0x15, 0x44, 0x35, 0x57, 0xaa, 0xbc,
		0xe6, 0xd9, 0x18, 0xa5, 0x8f, 0xf7, 0xa5, 0xdf, 0x6c, 0x91, 0x7a, 0x56, 0xfe, 0x12, 0xe0, 0x36,
		0x4e, 0xf2, 0xfc, 0x6e, 0xfa, 0xb3, 0x7e, 0xc6, 0xf9, 0x17, 0x98, 0xf6, 0x03, 0x24, 0x0b, 0x48,
		0xb6, 0x65, 0x5b, 0x56, 0x15, 0xaf, 0x84, 0xaa, 0x9d, 0xa0, 0x7f, 0x44, 0x32, 0x88, 0x6e, 0x78,
		0xbb, 0x69, 0x14, 0xc7, 0xfb, 0x98, 0x50, 0x0f, 0xf3, 0x87, 0x30, 0xdb, 0x8b, 0x32, 0xff, 0x3b,
		0x80, 0xa4, 0x17, 0x0d, 0x49, 0x21, 0x10, 0xcc, 0xf5, 0x0c, 0x04, 0x23, 0xcf, 0x00, 0x30, 0xd6,
		0xb5, 0x16, 0xb5, 0xed, 0x36, 0xa3, 0x31, 0x9e, 0x5c, 0x88, 0x9a, 0x93, 0x27, 0x30, 0x16, 0x72,
		0xbb, 0xd3, 0x2a, 0x1b, 0x2e, 0x86, 0x47, 0x31, 0x75, 0xc8, 0x38, 0x68, 0x76, 0x1a, 0x0b, 0x23,
		0x2c, 0x78, 0x48, 0x08, 0x8c, 0x18, 0x57, 0x97, 0x98, 0x72, 0x4c, 0xf1, 0xdb, 0xb0, 0x2f, 0x9b,
		0xba, 0x2e, 0x25, 0xc3, 0x04, 0x63, 0xea, 0xa1, 0xad, 0x48, 0xd5, 0x54, 0x3c, 0x8b, 0xec, 0x26,
		0x0e, 0xe6, 0x02, 0xa6, 0xfd, 0x3b, 0xb9, 0x63, 0xfc, 0x00, 0x26, 0x5c, 0xb2, 0xbe, 0xed, 0x88,
		0x4b, 0xe6, 0x4d, 0x2b, 0xbc, 0x1a, 0x7c, 0x6b, 0x8f, 0xa8, 0x43, 0xe6, 0xdc, 0xba, 0xc4, 0x17,
		0x14, 0x53, 0x87, 0xf2, 0xdf, 0x03, 0x88, 0xdc, 0x25, 0x92, 0x37, 0x10, 0x56, 0xfc, 0x86, 0x57,
		0x38, 0x29, 0xfd, 0xff, 0x99, 0x3a, 0x56, 0xf1, 0xd5, 0x50, 0xde, 0x8d, 0x4e, 0x57, 0x27, 0x67,
		0xd4, 0xf2, 0xcd, 0x26, 0xfe, 0x95, 0x04, 0x76, 0x47, 0x07, 0x0f, 0x5f, 0x40, 0x88, 0x7c, 0x32,
		0x01, 0x54, 0xcc, 0x1f, 0x90, 0x04, 0xa2, 0xef, 0x1f, 0xe9, 0xea, 0x74, 0xf5, 0x69, 0x3e, 0x20,
		0x31, 0x84, 0xc7, 0x94, 0x9e, 0xd1, 0x79, 0xb0, 0x24, 0x9f, 0x87, 0x3f, 0x52, 0x9c, 0xb8, 0xf6,
		0x7f, 0xf5, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x8c, 0xef, 0xcb, 0xe0, 0x03, 0x00, 0x00,
		func init() {
		proto.RegisterFile("frontend.proto", fileDescriptor_eca3873955a29cfe)
		}

		var fileDescriptor_eca3873955a29cfe = []byte{
		// 539 bytes of a gzipped FileDescriptorProto
		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0xd1, 0x6e, 0xd3, 0x4a,
		0x10, 0xbd, 0x4e, 0xe2, 0x38, 0x1e, 0x27, 0xb9, 0x61, 0x25, 0x90, 0xeb, 0x0a, 0x35, 0xea, 0x53,
		0x5f, 0x08, 0x12, 0x42, 0x42, 0x20, 0x24, 0x44, 0x44, 0x5a, 0x8a, 0x20, 0x95, 0xb6, 0x45, 0x48,
		0xbc, 0x44, 0x4e, 0x77, 0x5a, 0x8c, 0xec, 0x75, 0xe4, 0xdd, 0x54, 0xe2, 0x37, 0xf8, 0x09, 0xfe,
		0x80, 0xaf, 0xe3, 0x01, 0xed, 0xec, 0xda, 0x75, 0x68, 0xdf, 0x7c, 0x76, 0xce, 0x9c, 0x39, 0x7b,
		0x76, 0x64, 0x18, 0x5f, 0x55, 0xa5, 0xd4, 0x28, 0xc5, 0x6c, 0x53, 0x95, 0xba, 0x64, 0xbe, 0xcc,
		0xe4, 0xf7, 0xf4, 0xf0, 0x4f, 0x00, 0xfd, 0x73, 0x9d, 0xea, 0xad, 0x62, 0x2f, 0x21, 0xd2, 0xa5,
		0x4e, 0xf3, 0x15, 0x8a, 0x6b, 0x54, 0xb1, 0x37, 0xf5, 0x8e, 0xa2, 0x67, 0xf1, 0x8c, 0x78, 0x33,
		0xcb, 0x99, 0x5d, 0x18, 0xc2, 0xc2, 0xd4, 0x39, 0xe8, 0xe6, 0x9b, 0xbd, 0x81, 0xd1, 0x7a, 0x9b,
		0xe5, 0x62, 0xa5, 0x74, 0x5a, 0x69, 0x14, 0x71, 0x87, 0x9a, 0x93, 0xdd, 0xe6, 0xb9, 0xa1, 0x9c,
		0x5b, 0x06, 0x1f, 0xae, 0x5b, 0x88, 0xcd, 0x61, 0x6c, 0x05, 0xae, 0x32, 0x99, 0xa9, 0x6f, 0x28,
		0xe2, 0x2e, 0x29, 0xec, 0xdf, 0xa3, 0x70, 0xec, 0x28, 0xdc, 0xce, 0xac, 0x21, 0x7b, 0x0d, 0x43,
		0xe3, 0xbc, 0xf1, 0xd0, 0x23, 0x85, 0xbd, 0x5d, 0x05, 0xe3, 0xb7, 0xb6, 0x10, 0xe1, 0x2d, 0x30,
		0x57, 0xa0, 0xee, 0xc6, 0x80, 0x7f, 0xdf, 0x15, 0x4c, 0x7b, 0x33, 0x9f, 0xc6, 0x35, 0xe3, 0x9f,
		0x42, 0x50, 0xa0, 0x52, 0xe9, 0x35, 0xc6, 0x7d, 0x6a, 0x7d, 0xb8, 0xdb, 0xfa, 0xc9, 0x16, 0x79,
		0xcd, 0x4a, 0x9e, 0x00, 0xdc, 0xc6, 0xc9, 0x0e, 0xee, 0xa6, 0x3f, 0x6a, 0x67, 0x9c, 0x7c, 0x80,
		0x61, 0x3b, 0x40, 0x36, 0x85, 0x68, 0x93, 0x56, 0x69, 0x9e, 0x63, 0x9e, 0xa9, 0xc2, 0x35, 0xb4,
		0x8f, 0x58, 0x0c, 0xc1, 0x0d, 0x56, 0xeb, 0x52, 0x21, 0xbd, 0xc7, 0x80, 0xd7, 0x30, 0xf9, 0x1f,
		0x46, 0x3b, 0x51, 0x26, 0xbf, 0x3d, 0x88, 0x5a, 0xd1, 0xb0, 0x31, 0x74, 0x32, 0xe1, 0x34, 0x3b,
		0x99, 0x60, 0x8f, 0x01, 0x28, 0xd6, 0x95, 0xce, 0x0a, 0xab, 0x36, 0xe2, 0x21, 0x9d, 0x5c, 0x64,
		0x05, 0xb2, 0x47, 0xd0, 0xcf, 0xe4, 0x66, 0xab, 0x55, 0xdc, 0x9d, 0x76, 0x8f, 0x42, 0xee, 0x90,
		0x71, 0x50, 0x6e, 0x35, 0x15, 0x7a, 0x54, 0xa8, 0x21, 0x63, 0xd0, 0x13, 0xa8, 0x2e, 0x29, 0xe5,
		0x90, 0xd3, 0xb7, 0x61, 0x5f, 0x96, 0x45, 0x91, 0x4a, 0x41, 0x09, 0x86, 0xbc, 0x86, 0xb6, 0x22,
		0x55, 0x99, 0x63, 0x1c, 0xd8, 0x9b, 0x38, 0x98, 0xfc, 0xf2, 0x60, 0xd8, 0x7e, 0x94, 0x3b, 0xce,
		0xf7, 0x60, 0x80, 0x52, 0xb4, 0x7d, 0x07, 0x28, 0x45, 0xed, 0x5a, 0xd1, 0xdb, 0xd0, 0xb2, 0x3d,
		0xe0, 0x0e, 0x99, 0x73, 0x6b, 0x93, 0x56, 0x28, 0xe4, 0x0e, 0xb1, 0x7d, 0x08, 0xb7, 0x0a, 0x2b,
		0xab, 0xe5, 0x93, 0xd6, 0xc0, 0x1c, 0x90, 0xd8, 0x01, 0x44, 0xea, 0x87, 0xd2, 0x58, 0xd8, 0x72,
		0xdf, 0xbe, 0x9f, 0x3d, 0x32, 0x84, 0xe4, 0xa7, 0x07, 0x81, 0xdb, 0x01, 0xf6, 0x02, 0xfc, 0x1c,
		0x6f, 0x30, 0x27, 0x9f, 0xe3, 0x7f, 0xb7, 0xdc, 0xb1, 0x66, 0x1f, 0x0d, 0xe5, 0x55, 0xef, 0x74,
		0x79, 0x7c, 0xc6, 0x2d, 0xdf, 0x04, 0x51, 0x2f, 0x59, 0xc7, 0x46, 0xe4, 0xe0, 0xe1, 0x73, 0xf0,
		0x89, 0xcf, 0x06, 0x40, 0x1d, 0x93, 0xff, 0x58, 0x04, 0xc1, 0x97, 0xb7, 0x7c, 0x79, 0xba, 0x3c,
		0x99, 0x78, 0x2c, 0x04, 0x7f, 0xc1, 0xf9, 0x19, 0x9f, 0x74, 0xcc, 0xe7, 0xbb, 0xc5, 0xfc, 0xf3,
		0xc9, 0xa4, 0x3b, 0x67, 0xef, 0xbb, 0x5f, 0xc7, 0x34, 0x7c, 0x55, 0xff, 0x1f, 0xfe, 0x06, 0x00,
		0x00, 0xff, 0xff, 0xaf, 0x93, 0x48, 0xcf, 0x2a, 0x04, 0x00, 0x00,
		}

ui/status/ninja_frontend/frontend.proto

+6 −1

Original line number	Diff line number	Diff line
		@@ -61,6 +61,10 @@ message Status {
		optional sint32 status = 3;
		// Edge output, may contain ANSI codes.
		optional string output = 4;
		// Number of milliseconds spent executing in user mode
		optional uint32 user_time = 5;
		// Number of milliseconds spent executing in kernel mode
		optional uint32 system_time = 6;
		}

		message Message {
		@@ -68,8 +72,9 @@ message Status {
		INFO = 0;
		WARNING = 1;
		ERROR = 2;
		DEBUG = 3;
		}
		// Message priority level (INFO, WARNING, or ERROR).
		// Message priority level (DEBUG, INFO, WARNING, ERROR).
		optional Level level = 1 [default = INFO];
		// Info/warning/error message from Ninja.
		optional string message = 2;