Fix on breaking buildtarget refactor
CQs aren't linked together, so this wasn't caught for the prototyping
proto defs. Fixing for now and will fix CQ coverage on follow-up cl
Change-Id: I06acf47619fc91ba8893e5be8517eeba82d8e909
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2412268
Tested-by: C Shapiro <shapiroc@chromium.org>
Auto-Submit: C Shapiro <shapiroc@chromium.org>
Reviewed-by: C Shapiro <shapiroc@chromium.org>
Commit-Queue: C Shapiro <shapiroc@chromium.org>
diff --git a/go/prototype/builder_config.pb.go b/go/prototype/builder_config.pb.go
index 90d9756..80f1eaf 100644
--- a/go/prototype/builder_config.pb.go
+++ b/go/prototype/builder_config.pb.go
@@ -6,7 +6,7 @@
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
- prototype "go.chromium.org/chromiumos/config/go/prototype"
+ software "go.chromium.org/chromiumos/config/go/api/software"
math "math"
)
@@ -26,10 +26,10 @@
// Whether this builder should be considered criticial.
Critical bool `protobuf:"varint,1,opt,name=critical,proto3" json:"critical,omitempty"`
// Defines the build target for this builder config.
- BuildTarget *prototype.BuildTarget `protobuf:"bytes,2,opt,name=build_target,json=buildTarget,proto3" json:"build_target,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ BuildTarget *software.SystemImage_BuildTarget `protobuf:"bytes,2,opt,name=build_target,json=buildTarget,proto3" json:"build_target,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *BuilderConfig) Reset() { *m = BuilderConfig{} }
@@ -64,7 +64,7 @@
return false
}
-func (m *BuilderConfig) GetBuildTarget() *prototype.BuildTarget {
+func (m *BuilderConfig) GetBuildTarget() *software.SystemImage_BuildTarget {
if m != nil {
return m.BuildTarget
}
@@ -78,17 +78,19 @@
func init() { proto.RegisterFile("prototype/builder_config.proto", fileDescriptor_3f63408d3c1e26ca) }
var fileDescriptor_3f63408d3c1e26ca = []byte{
- // 180 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x28, 0xca, 0x2f,
- 0xc9, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0x2a, 0xcd, 0xcc, 0x49, 0x49, 0x2d, 0x8a, 0x4f, 0xce,
- 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x03, 0x4b, 0x08, 0x71, 0xc2, 0xe5, 0xa5, 0xf4, 0x92, 0x33, 0x8a,
- 0xf2, 0x73, 0x33, 0x4b, 0x73, 0xf3, 0x8b, 0xf5, 0x21, 0x6a, 0xf4, 0xd1, 0x34, 0xc7, 0x97, 0x24,
- 0x16, 0xa5, 0xa7, 0x96, 0x40, 0xb4, 0x2a, 0x55, 0x70, 0xf1, 0x3a, 0x41, 0x8c, 0x74, 0x06, 0xab,
- 0x16, 0x92, 0xe2, 0xe2, 0x48, 0x2e, 0xca, 0x2c, 0xc9, 0x4c, 0x4e, 0xcc, 0x91, 0x60, 0x54, 0x60,
- 0xd4, 0xe0, 0x08, 0x82, 0xf3, 0x85, 0xbc, 0xb9, 0x78, 0x90, 0x8d, 0x90, 0x60, 0x52, 0x60, 0xd4,
- 0xe0, 0x36, 0xd2, 0x40, 0xb2, 0x53, 0x0f, 0xd9, 0x5d, 0x20, 0x3b, 0xf5, 0xc0, 0xa6, 0x87, 0x80,
- 0xd5, 0x07, 0x71, 0x27, 0x21, 0x38, 0x4e, 0xa6, 0x51, 0xc6, 0xe9, 0xf9, 0x70, 0xad, 0x7a, 0xf9,
- 0x45, 0xe9, 0xfa, 0x48, 0x6e, 0xcf, 0xcc, 0x4b, 0x2b, 0x4a, 0x84, 0x38, 0x5d, 0x3f, 0x3d, 0x1f,
- 0xe1, 0x87, 0x24, 0x36, 0x30, 0xd3, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x88, 0xc1, 0xe0, 0xc9,
- 0x14, 0x01, 0x00, 0x00,
+ // 214 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8f, 0x31, 0x4f, 0xc3, 0x30,
+ 0x10, 0x85, 0x65, 0x06, 0x54, 0x5c, 0x58, 0x32, 0x55, 0x1d, 0x50, 0xc5, 0xd4, 0xc9, 0x27, 0xa8,
+ 0x10, 0x7b, 0x99, 0x58, 0x0b, 0x53, 0x97, 0xc8, 0x31, 0x8e, 0x39, 0xa9, 0xee, 0x59, 0x67, 0x47,
+ 0x28, 0xbf, 0x80, 0xbf, 0x8d, 0x74, 0x01, 0xa7, 0x9b, 0x4f, 0xcf, 0xef, 0x7d, 0xef, 0xe9, 0xfb,
+ 0xc4, 0x54, 0xa8, 0x8c, 0xc9, 0x43, 0x37, 0xe0, 0xe9, 0xd3, 0x73, 0xeb, 0xe8, 0xdc, 0x63, 0x30,
+ 0x22, 0x34, 0x37, 0x55, 0x5f, 0x3f, 0xba, 0x2f, 0xa6, 0x88, 0x43, 0xa4, 0x0c, 0xd3, 0x1f, 0xb0,
+ 0x09, 0x21, 0x53, 0x5f, 0xbe, 0x2d, 0x7b, 0xc8, 0x63, 0x2e, 0x3e, 0xb6, 0x18, 0x6d, 0xf0, 0x93,
+ 0xfb, 0xe1, 0x47, 0xe9, 0xbb, 0xfd, 0x14, 0xfb, 0x2a, 0x8e, 0x66, 0xad, 0x17, 0x8e, 0xb1, 0xa0,
+ 0xb3, 0xa7, 0x95, 0xda, 0xa8, 0xed, 0xe2, 0x50, 0xef, 0xe6, 0xa8, 0x6f, 0xa5, 0x43, 0x5b, 0x2c,
+ 0x07, 0x5f, 0x56, 0x57, 0x1b, 0xb5, 0x5d, 0x3e, 0xbd, 0x98, 0x99, 0x6b, 0xfe, 0xba, 0xd9, 0x84,
+ 0xe6, 0x9f, 0x6b, 0xde, 0x85, 0xfb, 0x26, 0x58, 0x81, 0x7d, 0x88, 0xfd, 0xb0, 0xec, 0xe6, 0x63,
+ 0xff, 0x7c, 0xdc, 0x05, 0xaa, 0x49, 0x86, 0x38, 0xc0, 0xc5, 0x1c, 0x3c, 0xf7, 0x6c, 0x41, 0x3a,
+ 0x43, 0x20, 0xa8, 0x9b, 0xbb, 0x6b, 0x79, 0xee, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x87, 0xfd,
+ 0x8a, 0x5b, 0x27, 0x01, 0x00, 0x00,
}
diff --git a/src/prototype/builder_config.proto b/src/prototype/builder_config.proto
index a371cc0..2ea0416 100644
--- a/src/prototype/builder_config.proto
+++ b/src/prototype/builder_config.proto
@@ -6,16 +6,15 @@
package prototype;
-import "chromiumos/config/prototype/build_target.proto";
+import "chromiumos/config/api/software/system_image.proto";
option go_package = "go.chromium.org/chromiumos/infra/proto/go/prototype";
// Defines a builder from platform's point of view.
message BuilderConfig {
-
// Whether this builder should be considered criticial.
bool critical = 1;
// Defines the build target for this builder config.
- chromiumos.config.prototype.BuildTarget build_target = 2;
+ chromiumos.config.api.software.SystemImage.BuildTarget build_target = 2;
}
