From 9c8c9ff82a2340ab3fa2c8377cdcb8b955396fe6 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Jun 2023 18:21:57 +0000 Subject: [PATCH] rust: Add support for CARGO_PKG_NAME Technically cargo package names and crate names can be different, but this is rare and usually only a matter of presentation. Adding basic support in this fashion lets several crates build without adding significant machinery. Bug: 276464273 Test: Build a crate which uses this environment variable Change-Id: I4f4c8c9e277789de7a63be2457f00090e8c3e973 --- rust/builder.go | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/builder.go b/rust/builder.go index 0dfaef49f..bf009a5de 100644 --- a/rust/builder.go +++ b/rust/builder.go @@ -324,6 +324,7 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl envVars = append(envVars, "CARGO_BIN_NAME="+strings.TrimSuffix(outputFile.Base(), outputFile.Ext())) } envVars = append(envVars, "CARGO_CRATE_NAME="+ctx.RustModule().CrateName()) + envVars = append(envVars, "CARGO_PKG_NAME="+ctx.RustModule().CrateName()) pkgVersion := ctx.RustModule().compiler.CargoPkgVersion() if pkgVersion != "" { envVars = append(envVars, "CARGO_PKG_VERSION="+pkgVersion)