diff options
| author | 2022-04-12 10:29:43 -0400 | |
|---|---|---|
| committer | 2022-04-12 10:29:43 -0400 | |
| commit | 6d14ed157e1529490dd9fa281548015ca1cae152 (patch) | |
| tree | 56d7500a2cf6df6ca35966cb8d26429873241240 /rust/builder.go | |
| parent | d72c85219a4121d64b4ed7077d87ccdb54351b28 (diff) | |
rust: set ANDROID_RUST_VERSION based on prebuilts
ANDROID_RUST_VERSION is always set to the default Rust version, rather
than than respecting the RUST_PREBUILTS_VERSION setting. This is not the
correct behavior, this CL resolves the issue.
Test: m nothing
Change-Id: I3f8a2fc3590b7313286278b77534bb669cc693d6
Diffstat (limited to 'rust/builder.go')
| -rw-r--r-- | rust/builder.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/builder.go b/rust/builder.go index 00035b9b7..20ca5dbee 100644 --- a/rust/builder.go +++ b/rust/builder.go @@ -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 { |