StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge rust_protobuf and rust_grpcio module types.

Browse Source 
To allow grpc protobufs to include non-grpc protos in a singular
library, we need to allow them to be defined as part of the same module.

This CL merges the two previously distinct module types into
rust_protobuf, and adds a new property for declaring which protos
contain grpc definitions.

Bug: 172952239
Test: rust_grpcio modules converted to rust_protobuf modules and build.
Test: Example rust_protobuf module with both proto types builds.
Change-Id: I0e627fd97bc6f74de89d309e3344694a1e76586d
This commit is contained in:
Ivan Lozano
2020-12-11 15:25:59 -05:00
parent 30530a9e34
commit 6eff900b67
4 changed files with 121 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
rust/protobuf_test.go
View File

@@ -69,31 +69,19 @@ func TestRustProtobuf(t *testing.T) {
}
}
func TestRustGrpcio(t *testing.T) {
func TestRustGrpc(t *testing.T) {
ctx := testRust(t, `
rust_grpcio {
rust_protobuf {
name: "librust_grpcio",
protos: ["buf.proto", "proto.proto"],
protos: ["buf.proto"],
grpc_protos: ["foo.proto", "proto.proto"],
crate_name: "rust_grpcio",
source_stem: "buf",
shared_libs: ["libfoo_shared"],
static_libs: ["libfoo_static"],
}
cc_library_shared {
name: "libfoo_shared",
export_include_dirs: ["shared_include"],
}
cc_library_static {
name: "libfoo_static",
export_include_dirs: ["static_include"],
}
`)
// Check that libprotobuf is added as a dependency.
librust_grpcio_module := ctx.ModuleForTests("librust_grpcio", "android_arm64_armv8-a_dylib").Module().(*Module)
if !android.InList("libprotobuf", librust_grpcio_module.Properties.AndroidMkDylibs) {
t.Errorf("libprotobuf dependency missing for rust_grpcio (dependency missing from AndroidMkDylibs)")
}
// Check that libgrpcio is added as a dependency.
if !android.InList("libgrpcio", librust_grpcio_module.Properties.AndroidMkDylibs) {
@@ -106,20 +94,12 @@ func TestRustGrpcio(t *testing.T) {
}
// Make sure the correct plugin is being used.
librust_grpcio_out := ctx.ModuleForTests("librust_grpcio", "android_arm64_armv8-a_source").Output("buf_grpc.rs")
librust_grpcio_out := ctx.ModuleForTests("librust_grpcio", "android_arm64_armv8-a_source").Output("foo_grpc.rs")
cmd := librust_grpcio_out.RuleParams.Command
if w := "protoc-gen-grpc"; !strings.Contains(cmd, w) {
t.Errorf("expected %q in %q", w, cmd)
}
// Check exported include directories
if w := "-Ishared_include"; !strings.Contains(cmd, w) {
t.Errorf("expected %q in %q", w, cmd)
}
if w := "-Istatic_include"; !strings.Contains(cmd, w) {
t.Errorf("expected %q in %q", w, cmd)
}
// Check that we're including the exported directory from libprotobuf-cpp-full
if w := "-Ilibprotobuf-cpp-full-includes"; !strings.Contains(cmd, w) {
t.Errorf("expected %q in %q", w, cmd)
@@ -132,3 +112,25 @@ func TestRustGrpcio(t *testing.T) {
librust_grpcio_outputs)
}
}
func TestRustProtoErrors(t *testing.T) {
testRustError(t, "A proto can only be added once to either grpc_protos or protos.*", `
rust_protobuf {
name: "librust_grpcio",
protos: ["buf.proto"],
grpc_protos: ["buf.proto"],
crate_name: "rust_grpcio",
source_stem: "buf",
}
`)
testRustError(t, "proto filenames must be unique across 'protos' and 'grpc_protos'.*", `
rust_protobuf {
name: "librust_grpcio",
protos: ["buf.proto"],
grpc_protos: ["proto/buf.proto"],
crate_name: "rust_grpcio",
source_stem: "buf",
}
`)
}