From c49649c059ffa80433f7789250363728ce1f1608 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Thu, 1 Oct 2020 21:25:05 -0700 Subject: Use protobuf-codegen default and add mod_stem.rs * Upgrade to new protobuf-codegen; use its standard default output without local change. * Allow a sourceProvider to have multiple output files. For a stem.proto file, output stem.rs and mod_stem.rs. * New protobuf-codegen option gen_mod_rs always generates output file named "mod.rs". To generate multiple .proto files into the same output directory, we need to rename mod.rs to mod_.rs. * Instead of using the gen_mod_rs option and renaming mod.rs to mod_.rs, we generate the same mod_.rs directly with a simple printf command. Bug: 170256643 Test: atest -c --host --include-subdirs external/crosvm Change-Id: Ia09e41029099a6de4d35c96dbabd9ba5514c9019 --- rust/rust.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rust/rust.go') diff --git a/rust/rust.go b/rust/rust.go index ba8673c94..3f0f6e27d 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -709,7 +709,7 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { } else { sourceMod := actx.GetDirectDepWithTag(mod.Name(), sourceDepTag) sourceLib := sourceMod.(*Module).compiler.(*libraryDecorator) - mod.sourceProvider.setOutputFile(sourceLib.sourceProvider.Srcs()[0]) + mod.sourceProvider.setOutputFiles(sourceLib.sourceProvider.Srcs()) } } -- cgit v1.2.3-59-g8ed1b