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

rust: Import protos from dependent rust_protobuf

Browse Source 
rust_protobuf were unable to import protos from other rust_protobuf
modules. This CL adds support for that. rust_protobuf modules which are
listed in rustlibs will have their modules imported into the generated
protobuf stub. Additionally, rust_protobuf modules which define
"exported_include_dirs" will export those include paths to dependent
rust_protobuf modules.

Bug: 301266700
Test: m rust
Change-Id: I132edffa4d77e0ac80a7ac934f873374c8e94c1b
This commit is contained in:
Ivan Lozano
2023-09-21 23:30:26 -04:00
parent c5b9abba30
commit d106efe76d
3 changed files with 131 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
rust/protobuf_test.go
View File

@@ -118,6 +118,58 @@ func TestRustProtobuf3(t *testing.T) {
}
}
func TestRustProtobufInclude(t *testing.T) {
ctx := testRust(t, `
rust_protobuf {
name: "librust_proto",
protos: ["proto.proto"],
crate_name: "rust_proto",
source_stem: "proto",
use_protobuf3: true,
rustlibs: ["librust_exported_proto", "libfoo"],
}
rust_protobuf {
name: "librust_exported_proto",
protos: ["proto.proto"],
crate_name: "rust_exported_proto",
source_stem: "exported_proto",
use_protobuf3: true,
exported_include_dirs: ["proto"]
}
rust_library {
name: "libfoo",
crate_name: "foo",
srcs: ["foo.rs"],
}
`)
// Check that librust_exported_proto is added as additional crate to generate source.
librust_proto := ctx.ModuleForTests("librust_proto", "android_arm64_armv8-a_source").Module().(*Module).sourceProvider.(*protobufDecorator)
if !android.InList("rust_exported_proto", librust_proto.additionalCrates) {
t.Errorf("librust_proto should have librust_exported_proto included as an additional crate for generated source, instead got: %#v", librust_proto.additionalCrates)
}
// Make sure the default crates aren't being included.
if android.InList("std", librust_proto.additionalCrates) {
t.Errorf("librust_proto should not have included libstd as an additional crate for generated source, instead got: %#v", librust_proto.additionalCrates)
}
if android.InList("protobuf", librust_proto.additionalCrates) {
t.Errorf("librust_proto should not have included libprotobuf as an additional crate for generated source, instead got: %#v", librust_proto.additionalCrates)
}
// And make sure that non-protobuf crates aren't getting included either.
if android.InList("foo", librust_proto.additionalCrates) {
t.Errorf("librust_proto should not have included libfoo as an additional crate for generated source, instead got: %#v", librust_proto.additionalCrates)
}
// Check librust_proto args includes -Iproto
librust_proto_rule := ctx.ModuleForTests("librust_proto", "android_arm64_armv8-a_source").Output("proto.rs")
cmd := librust_proto_rule.RuleParams.Command
if w := "-Iproto"; !strings.Contains(cmd, w) {
t.Errorf("expected %q in %q", w, cmd)
}
}
func TestRustGrpc(t *testing.T) {
ctx := testRust(t, `
rust_protobuf {