| commit | fb6af66ccea1fea72f0e0a03c41f32094038b09d | [log] [tgz] |
|---|---|---|
| author | Tamir Duberstein <tamird@google.com> | Mon Mar 22 21:45:53 2021 +0000 |
| committer | CQ Bot <commit-bot@chromium.org> | Mon Mar 22 21:45:53 2021 +0000 |
| tree | b415dc35618f7416c4b572febbd62fcb737fdd02 | |
| parent | 04a5c2a6dcf75c642174b4273fed3d05c9df9b94 [diff] |
Update google.golang.org/protobuf to v1.26.0 This requires setting go_package to a path in yamlpb_test.proto. See https://github.com/protocolbuffers/protobuf-go/commit/8b366e8 for details. The other protos in this repository already comply. Tested: ./cobaltb.py build && ./cobaltb.py test --tests go Bug: 35565 Change-Id: Iecd2f58cf3664cda9a51365e0675b47e579153cd Reviewed-on: https://fuchsia-review.googlesource.com/c/cobalt/+/504464 Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com> Fuchsia-Auto-Submit: Tamir Duberstein <tamird@google.com> Reviewed-by: Jared Weinstein <jaredweinstein@google.com>
diff --git a/src/bin/config_parser/src/yamlpb/yamlpb_test.proto b/src/bin/config_parser/src/yamlpb/yamlpb_test.proto index e337777..ac00d8a 100644 --- a/src/bin/config_parser/src/yamlpb/yamlpb_test.proto +++ b/src/bin/config_parser/src/yamlpb/yamlpb_test.proto
@@ -7,7 +7,7 @@ package yamlpb; -option go_package = ".;yamlpb"; +option go_package = "src/yamlpb"; enum TestEnum { VAL0 = 0;
diff --git a/third_party/go/src/google.golang.org/protobuf b/third_party/go/src/google.golang.org/protobuf index 3f7a61f..f2d1f6c 160000 --- a/third_party/go/src/google.golang.org/protobuf +++ b/third_party/go/src/google.golang.org/protobuf
@@ -1 +1 @@ -Subproject commit 3f7a61f89bb6813f89d981d1870ed68da0b3c3f1 +Subproject commit f2d1f6cbe10b90d22296ea09a7217081c2798009