diff options
| author | 2021-07-29 18:29:26 +0000 | |
|---|---|---|
| committer | 2021-07-29 18:29:26 +0000 | |
| commit | f42f01b49d3e3d28ef2b0ae8f90cacd6f2b36ce2 (patch) | |
| tree | bdfd8edb371bb88eb79b00c39987bdae92264cb3 /cmd/sbox/sbox.go | |
| parent | c4dae8eb27c37466f8ca7217d9652db4c599f05c (diff) | |
| parent | 4591b6496deaffa6fa9f21ae546e2815e510866d (diff) | |
Merge "Upgrade to golang protobuf api v2"
Diffstat (limited to 'cmd/sbox/sbox.go')
| -rw-r--r-- | cmd/sbox/sbox.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/sbox/sbox.go b/cmd/sbox/sbox.go index f124e40b0..c7f3f6a44 100644 --- a/cmd/sbox/sbox.go +++ b/cmd/sbox/sbox.go @@ -34,7 +34,7 @@ import ( "android/soong/makedeps" "android/soong/response" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/encoding/prototext" ) var ( @@ -203,7 +203,7 @@ func readManifest(file string) (*sbox_proto.Manifest, error) { manifest := sbox_proto.Manifest{} - err = proto.UnmarshalText(string(manifestData), &manifest) + err = prototext.Unmarshal(manifestData, &manifest) if err != nil { return nil, fmt.Errorf("error parsing manifest %q: %w", file, err) } |