Upgrade to golang protobuf api v2
Major operations: * Fix the go_package entries to be consistent, as the new tool complains when it doesn't have a '/'. * Regenerate with the new protoc-gen-go tool. * github.com/golang/protobuf -> google.golang.org/protobuf * proto.[Un]MarshalText -> prototext.[Un]Marshal Change-Id: Ie1147bd2457fafb66ba555461b3bf14f0561a25d
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
Reference in New Issue
Block a user