Merge "rust: set ANDROID_RUST_VERSION based on prebuilts" (5e745599) · Commits · e / os / android_build_soong

rust/builder.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl
		implicits = append(implicits, outputs.Paths()...)
		}

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

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

+12 −6

Original line number	Diff line number	Diff line
		@@ -86,12 +86,7 @@ func init() {
		return "${RustDefaultBase}"
		})

		pctx.VariableFunc("RustVersion", func(ctx android.PackageVarContext) string {
		if override := ctx.Config().Getenv("RUST_PREBUILTS_VERSION"); override != "" {
		return override
		}
		return RustDefaultVersion
		})
		pctx.VariableFunc("RustVersion", getRustVersionPctx)

		pctx.StaticVariable("RustPath", "${RustBase}/${HostPrebuiltTag}/${RustVersion}")
		pctx.StaticVariable("RustBin", "${RustPath}/bin")
		@@ -103,3 +98,14 @@ func init() {
		pctx.StaticVariable("DeviceGlobalLinkFlags", strings.Join(deviceGlobalLinkFlags, " "))

		}

		func getRustVersionPctx(ctx android.PackageVarContext) string {
		return GetRustVersion(ctx)
		}

		func GetRustVersion(ctx android.PathContext) string {
		if override := ctx.Config().Getenv("RUST_PREBUILTS_VERSION"); override != "" {
		return override
		}
		return RustDefaultVersion
		}