diff options
| author | Ivan Lozano <ivanlozano@google.com> | 2020-12-11 15:25:59 -0500 |
|---|---|---|
| committer | Ivan Lozano <ivanlozano@google.com> | 2020-12-11 16:19:02 -0500 |
| commit | 6eff900b67a0ed7e639ae304b1d453b620e9b79d (patch) | |
| tree | 12d379cc2cdb8c9f6d95f13c9a38eb37a49a686d /rust/testing.go | |
| parent | 30530a9e34405e6bf7df4a40e9c3dfc97da9efd6 (diff) | |
Merge rust_protobuf and rust_grpcio module types.
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
Diffstat (limited to 'rust/testing.go')
| -rw-r--r-- | rust/testing.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/rust/testing.go b/rust/testing.go index 963a4eaf7..07f557ab8 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -153,8 +153,6 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { ctx.RegisterModuleType("rust_ffi_host", RustFFIHostFactory) ctx.RegisterModuleType("rust_ffi_host_shared", RustFFISharedHostFactory) ctx.RegisterModuleType("rust_ffi_host_static", RustFFIStaticHostFactory) - ctx.RegisterModuleType("rust_grpcio", RustGrpcioFactory) - ctx.RegisterModuleType("rust_grpcio_host", RustGrpcioHostFactory) ctx.RegisterModuleType("rust_proc_macro", ProcMacroFactory) ctx.RegisterModuleType("rust_protobuf", RustProtobufFactory) ctx.RegisterModuleType("rust_protobuf_host", RustProtobufHostFactory) |