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

Revert^3 "add rust_toolchain_rustc_prebuilt module type"

Browse Source 
9333ac1249

Change-Id: Ic7f064806553a0cfbc286136a764b5ea3898d06c
This commit is contained in:
Wen-yi Chu
2023-09-22 03:58:59 +00:00
parent 9c64274b27
commit 930fd8bfb1
4 changed files with 13 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rust/config/global.go
View File

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