rust_grpcio well known types support, default deps
The usage of the well known type Empty requires a hack in the module above the grpc implementation, this is now the generated stem_mod.rs This also adds additional implicit dependencies that are required by the grpc protobuf generated code. This includes the addition of a 'header_libs' property for library dependencies which export include paths required by protos. We also now include both the protos and the grpcio in the library variant via the mod_stem.rs. Bug: 172592789 Bug: 171504899 Test: m nothing Test: Example rust_grpcio module build command includes dependencies, include paths. Change-Id: I187a13cd5cdea991828a1020314de16727e4f74e
This commit is contained in:
@@ -28,6 +28,16 @@ func TestRustProtobuf(t *testing.T) {
|
||||
proto: "buf.proto",
|
||||
crate_name: "rust_proto",
|
||||
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.
|
||||
@@ -43,6 +53,13 @@ func TestRustProtobuf(t *testing.T) {
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRustGrpcio(t *testing.T) {
|
||||
@@ -52,6 +69,16 @@ func TestRustGrpcio(t *testing.T) {
|
||||
proto: "buf.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"],
|
||||
}
|
||||
`)
|
||||
|
||||
@@ -61,10 +88,33 @@ func TestRustGrpcio(t *testing.T) {
|
||||
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) {
|
||||
t.Errorf("libgrpcio dependency missing for rust_grpcio (dependency missing from AndroidMkDylibs)")
|
||||
}
|
||||
|
||||
// Check that libfutures is added as a dependency.
|
||||
if !android.InList("libfutures", librust_grpcio_module.Properties.AndroidMkDylibs) {
|
||||
t.Errorf("libfutures dependency missing for rust_grpcio (dependency missing from AndroidMkDylibs)")
|
||||
}
|
||||
|
||||
// Make sure the correct plugin is being used.
|
||||
librust_grpcio_out := ctx.ModuleForTests("librust_grpcio", "android_arm64_armv8-a_source").Output("buf.rs")
|
||||
librust_grpcio_out := ctx.ModuleForTests("librust_grpcio", "android_arm64_armv8-a_source").Output("buf_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)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user