test: Reland dependency on chromiumos/config protobufs
BUG=chromium:1051694
TEST=./generate.sh
TEST=Recipe autoroller continues to roll forward
Change-Id: I8850cc38e988cc2bf1f3dd53c9747fe9f371b2cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2095885
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: George Engelbrecht <engeg@google.com>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/go/test/common/device.pb.go b/go/test/common/device.pb.go
index 1a262f3..3c1a818 100644
--- a/go/test/common/device.pb.go
+++ b/go/test/common/device.pb.go
@@ -9,6 +9,7 @@
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
+ api "go.chromium.org/chromiumos/config/go/api"
math "math"
)
@@ -25,9 +26,13 @@
// Specification of known characteristics of a Device Under Test.
type Device struct {
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ // The relationship between topology and features is described at
+ // https://chromium.googlesource.com/chromiumos/config/+/master/proto/api/hardware_topology.md
+ HardwareTopology *api.HardwareTopology `protobuf:"bytes,1,opt,name=hardware_topology,json=hardwareTopology,proto3" json:"hardware_topology,omitempty"`
+ HardwareFeatures *api.HardwareFeatures `protobuf:"bytes,2,opt,name=hardware_features,json=hardwareFeatures,proto3" json:"hardware_features,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *Device) Reset() { *m = Device{} }
@@ -55,6 +60,20 @@
var xxx_messageInfo_Device proto.InternalMessageInfo
+func (m *Device) GetHardwareTopology() *api.HardwareTopology {
+ if m != nil {
+ return m.HardwareTopology
+ }
+ return nil
+}
+
+func (m *Device) GetHardwareFeatures() *api.HardwareFeatures {
+ if m != nil {
+ return m.HardwareFeatures
+ }
+ return nil
+}
+
func init() {
proto.RegisterType((*Device)(nil), "test.common.Device")
}
@@ -62,10 +81,16 @@
func init() { proto.RegisterFile("test/common/device.proto", fileDescriptor_17b7f6a742a27486) }
var fileDescriptor_17b7f6a742a27486 = []byte{
- // 69 bytes of a gzipped FileDescriptorProto
+ // 171 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x49, 0x2d, 0x2e,
0xd1, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0x4f, 0x49, 0x2d, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b,
- 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x06, 0xc9, 0xe8, 0x41, 0x64, 0x94, 0x38, 0xb8, 0xd8, 0x5c,
- 0xc0, 0x92, 0x49, 0x6c, 0x60, 0x59, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xd1, 0xaf,
- 0xa3, 0x39, 0x00, 0x00, 0x00,
+ 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x06, 0xc9, 0xe8, 0x41, 0x64, 0xa4, 0xa4, 0x13, 0x0b, 0x32,
+ 0xf5, 0x33, 0x12, 0x8b, 0x52, 0xca, 0x13, 0x8b, 0x52, 0xe3, 0x4b, 0xf2, 0x0b, 0xf2, 0x73, 0xf2,
+ 0xd3, 0x2b, 0x21, 0x2a, 0xa5, 0x84, 0x40, 0x92, 0xa8, 0x62, 0x4a, 0x5b, 0x18, 0xb9, 0xd8, 0x5c,
+ 0xc0, 0xc6, 0x09, 0x85, 0x70, 0x09, 0x62, 0xe8, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x52,
+ 0xd7, 0x4b, 0xce, 0x28, 0xca, 0xcf, 0xcd, 0x2c, 0xcd, 0xcd, 0x2f, 0xd6, 0x4b, 0xce, 0xcf, 0x4b,
+ 0xcb, 0x4c, 0xd7, 0x4b, 0x2c, 0xc8, 0xd4, 0xf3, 0x80, 0xaa, 0x0f, 0x81, 0x2a, 0x0f, 0x12, 0xc8,
+ 0x40, 0x13, 0x41, 0x31, 0x35, 0x2d, 0x35, 0xb1, 0xa4, 0xb4, 0x28, 0xb5, 0x58, 0x82, 0x89, 0x28,
+ 0x53, 0xdd, 0xa0, 0xca, 0x11, 0xa6, 0xc2, 0x44, 0x92, 0xd8, 0xc0, 0xae, 0x37, 0x06, 0x04, 0x00,
+ 0x00, 0xff, 0xff, 0xcd, 0x37, 0x7c, 0x6a, 0x17, 0x01, 0x00, 0x00,
}
diff --git a/src/test/common/device.proto b/src/test/common/device.proto
index 7c18bdf..cd8faee 100644
--- a/src/test/common/device.proto
+++ b/src/test/common/device.proto
@@ -8,16 +8,14 @@
// APIs.
package test.common;
-// TODO(crbug.com/1051694) re-populate this file once recipe roll is fixed.
-
// From chromiumos/config repo.
-// import "api/hardware_topology.proto";
-// import "api/topology.proto";
+import "api/hardware_topology.proto";
+import "api/topology.proto";
// Specification of known characteristics of a Device Under Test.
message Device {
// The relationship between topology and features is described at
// https://chromium.googlesource.com/chromiumos/config/+/master/proto/api/hardware_topology.md
- // chromiumos.config.api.HardwareTopology hardware_topology = 1;
- // chromiumos.config.api.HardwareFeatures hardware_features = 2;
+ chromiumos.config.api.HardwareTopology hardware_topology = 1;
+ chromiumos.config.api.HardwareFeatures hardware_features = 2;
}
