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

Commit 34609fae authored by Matthew Maurer's avatar Matthew Maurer
Browse files

rust: Set env variables consistently for build/doc 

Test: m rustdoc
Bug: 288151817
Bug: 288129815
Change-Id: I7fbf9eaea243fa2832f3dff717deb7889e0ed17c
parent 10fb90c3

rust/builder.go

+16 −16
Original line number Diff line number Diff line
@@ -217,6 +217,22 @@ func rustEnvVars(ctx ModuleContext, deps PathDeps) []string { 
		envVars = append(envVars, "OUT_DIR=out")

	}



	envVars = append(envVars, "ANDROID_RUST_VERSION="+config.GetRustVersion(ctx))



	if ctx.RustModule().compiler.CargoEnvCompat() {

		if bin, ok := ctx.RustModule().compiler.(*binaryDecorator); ok {

			envVars = append(envVars, "CARGO_BIN_NAME="+bin.getStem(ctx))

		}

		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)

		}

	}



	envVars = append(envVars, "AR=${cc_config.ClangBin}/llvm-ar")



	return envVars

}
@@ -317,22 +333,6 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
		implicits = append(implicits, outputs.Paths()...)

	}



	envVars = append(envVars, "ANDROID_RUST_VERSION="+config.GetRustVersion(ctx))



	if ctx.RustModule().compiler.CargoEnvCompat() {

		if _, ok := ctx.RustModule().compiler.(*binaryDecorator); ok {

			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)

		}

	}



	envVars = append(envVars, "AR=${cc_config.ClangBin}/llvm-ar")



	if flags.Clippy {

		clippyFile := android.PathForModuleOut(ctx, outputFile.Base()+".clippy")

		ctx.Build(pctx, android.BuildParams{