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

Commit 44fb88a4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix some moved code from revert of aosp/2518976" into main am: 9301b11e 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799557



Change-Id: Idbaa0942e02f72d783da099b64db7f8575873ca7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 841d5b77 9301b11e

rust/builder.go

+4 −13
Original line number Diff line number Diff line
@@ -238,6 +238,10 @@ func rustEnvVars(ctx ModuleContext, deps PathDeps) []string { 
		}

	}



	if ctx.Darwin() {

		envVars = append(envVars, "ANDROID_RUST_DARWIN=true")

	}



	return envVars

}
@@ -346,19 +350,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())

		pkgVersion := ctx.RustModule().compiler.CargoPkgVersion()

		if pkgVersion != "" {

			envVars = append(envVars, "CARGO_PKG_VERSION="+pkgVersion)

		}

	}



	if flags.Clippy {

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

		ctx.Build(pctx, android.BuildParams{