Fix golang-protobuf tests am: 34d48059c2 am: b34db27e38 am: 5c0a661709 am: 77559201be am: 3f39cb7711
Change-Id: Ic85144a267b22cf312e918686984e3560990d4f5
diff --git a/Android.bp b/Android.bp
index 531562b..8fc8e6d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,6 +70,10 @@
"protoc-gen-go/main.go",
"protoc-gen-go/link_grpc.go",
],
+ testSrcs: [
+ // execs protoc from the PATH
+ //"protoc-gen-go/golden_test.go",
+ ],
}
bootstrap_go_package {
@@ -92,6 +96,9 @@
"proto/text.go",
"proto/text_parser.go",
],
+ testSrcs: [
+ "proto/size2_test.go",
+ ],
}
bootstrap_go_package {
@@ -112,6 +119,7 @@
name: "golang-protobuf-proto_test",
pkgPath: "github.com/golang/protobuf/proto_test",
deps: [
+ "golang-protobuf-jsonpb",
"golang-protobuf-proto",
"golang-protobuf-proto-proto3_proto",
"golang-protobuf-proto-test-proto",
@@ -122,6 +130,7 @@
"proto/any_test.go",
"proto/clone_test.go",
"proto/decode_test.go",
+ "proto/discard_test.go",
"proto/encode_test.go",
"proto/equal_test.go",
// Requires golang.org/x/sync/errgroup
@@ -130,7 +139,6 @@
"proto/message_set_test.go",
"proto/proto3_test.go",
"proto/size_test.go",
- "proto/size2_test.go",
"proto/text_parser_test.go",
"proto/text_test.go",
],
