Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b4d7cf4 authored by Matthew Maurer's avatar Matthew Maurer Committed by Gerrit Code Review
Browse files

Merge "rust: Add support for CARGO_PKG_NAME"

parents 1458515e 9c8c9ff8

rust/builder.go

+1 −0
Original line number Diff line number Diff line
@@ -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)