diff options
| author | 2022-04-13 14:31:46 +0000 | |
|---|---|---|
| committer | 2022-04-13 14:31:46 +0000 | |
| commit | 32598e01e9cb7d19e5555a25a8f36103ec1bb234 (patch) | |
| tree | f0988c87537e58c04b5efa08fddec1c43dfc8e2b | |
| parent | a6c662993571fef29db35b2391edc2feff9e3196 (diff) | |
| parent | eca7fc2fbcaf345ff52f2206dbc3bc5001cedb4c (diff) | |
Merge "rust: set ANDROID_RUST_VERSION based on prebuilts" am: 5e7455996e am: c07e7e9f3c am: eca7fc2fbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062367
Change-Id: I8438e0502763d0b3bf5d4e6f4565e9811ad735f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | rust/builder.go | 2 | ||||
| -rw-r--r-- | rust/config/global.go | 18 |
2 files changed, 13 insertions, 7 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 { diff --git a/rust/config/global.go b/rust/config/global.go index 1cf773e44..2d5fa991b 100644 --- a/rust/config/global.go +++ b/rust/config/global.go @@ -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 +} |