diff options
| author | 2023-09-25 14:47:19 -0400 | |
|---|---|---|
| committer | 2023-09-25 17:37:59 -0400 | |
| commit | 47faaad2544ad90f8faf4f7d999c4e85fd8c1c1b (patch) | |
| tree | 197a30ae1ba2a2706177092072711032095ca2d0 /rust/rust.go | |
| parent | b95a8b33be5f12f4bb1f3d6c12e1f42a646848e7 (diff) | |
Add bp2build for rust_protobuf module
We only supported bp2build for rust_protobuf_host because the non-host toolchain for rust is not checked in yet. aosp/2759750 changed a converted module from rust_protobuf_host to rust_protobuf and broke CI.
This CL adds bp2build support for rust_protobuf but makes the target incompatible with android os for now untilnon-host rust toolchain is checked in.
Bug: 301956497
Test: b build //build/make/tools/aconfig:all --config=android
Change-Id: I739896c79f32674000c2603e394f16860a6fc57d
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/rust.go b/rust/rust.go index 3b2448493..250e39857 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -1853,7 +1853,7 @@ func (m *Module) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { procMacroBp2build(ctx, m) } else if ctx.ModuleType() == "rust_binary_host" { binaryBp2build(ctx, m) - } else if ctx.ModuleType() == "rust_protobuf_host" { + } else if ctx.ModuleType() == "rust_protobuf_host" || ctx.ModuleType() == "rust_protobuf" { protoLibraryBp2build(ctx, m) } else { ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_TYPE_UNSUPPORTED, "") |