StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert^4 "add rust_toolchain_rustc_prebuilt module type"

Browse Source 
930fd8bfb1

Change-Id: Id3f3a66022a496aab7db93670a7bdf8507384875
This commit is contained in:
Sam Delmerico
2023-09-25 12:13:17 +00:00
parent 40c7bae1df
commit f2b16069bb
4 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rust/config/global.go
View File

@@ -81,13 +81,7 @@ var (
func init() {
pctx.SourcePathVariable("RustDefaultBase", RustDefaultBase)
pctx.VariableConfigMethod("HostPrebuiltTag", func(config android.Config) string {
if config.UseHostMusl() {
return "linux-musl-x86"
} else {
return config.PrebuiltOS()
}
})
pctx.VariableConfigMethod("HostPrebuiltTag", HostPrebuiltTag)
pctx.VariableFunc("RustBase", func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv("RUST_PREBUILTS_BASE"); override != "" {
@@ -109,6 +103,14 @@ func init() {
exportedVars.ExportStringStaticVariable("RUST_DEFAULT_VERSION", RustDefaultVersion)
}
func HostPrebuiltTag(config android.Config) string {
if config.UseHostMusl() {
return "linux-musl-x86"
} else {
return config.PrebuiltOS()
}
}
func getRustVersionPctx(ctx android.PackageVarContext) string {
return GetRustVersion(ctx)
}