Don't disable rust modules for linux_bionic
With If4300583edfb6d75bd4d984b38f73b6a406b4447, linux_bionic supports arm64 and rust toolchain was configured to support the new target. However, rust module types still have been disabled for linux_bionic targets which forces many rust modules to be annotated with target.linux_bionic_arm64.enabled: true, which will be very cumbersome. Therefore, stop disabling the rust modules for linux_bionic. Bug: 159685774 Test: HOST_CROSS_OS=linux_bionic m nothing Change-Id: I68b97a43e8252fb82da6e87b3481fa237e1f2691
This commit is contained in:
@@ -216,8 +216,8 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
|
|||||||
|
|
||||||
if !Bool(compiler.Properties.No_stdlibs) {
|
if !Bool(compiler.Properties.No_stdlibs) {
|
||||||
for _, stdlib := range config.Stdlibs {
|
for _, stdlib := range config.Stdlibs {
|
||||||
// If we're building for the primary host target, use the compiler's stdlibs
|
// If we're building for the primary arch of the build host, use the compiler's stdlibs
|
||||||
if ctx.Host() && ctx.TargetPrimary() {
|
if ctx.Target().Os == android.BuildOs && ctx.TargetPrimary() {
|
||||||
stdlib = stdlib + "_" + ctx.toolchain().RustTriple()
|
stdlib = stdlib + "_" + ctx.toolchain().RustTriple()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
15
rust/rust.go
15
rust/rust.go
@@ -559,21 +559,6 @@ func (mod *Module) Init() android.Module {
|
|||||||
android.InitAndroidArchModule(mod, mod.hod, mod.multilib)
|
android.InitAndroidArchModule(mod, mod.hod, mod.multilib)
|
||||||
|
|
||||||
android.InitDefaultableModule(mod)
|
android.InitDefaultableModule(mod)
|
||||||
|
|
||||||
// Explicitly disable unsupported targets.
|
|
||||||
android.AddLoadHook(mod, func(ctx android.LoadHookContext) {
|
|
||||||
disableTargets := struct {
|
|
||||||
Target struct {
|
|
||||||
Linux_bionic struct {
|
|
||||||
Enabled *bool
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}{}
|
|
||||||
disableTargets.Target.Linux_bionic.Enabled = proptools.BoolPtr(false)
|
|
||||||
|
|
||||||
ctx.AppendProperties(&disableTargets)
|
|
||||||
})
|
|
||||||
|
|
||||||
return mod
|
return mod
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user