From b5d2dd210ba784429d10fb9ef8cfc20aabf57ec9 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 31 Aug 2020 17:22:01 +0900 Subject: [PATCH] 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 --- rust/compiler.go | 4 ++-- rust/rust.go | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/rust/compiler.go b/rust/compiler.go index ddf1fac3a..664578d82 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -216,8 +216,8 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { if !Bool(compiler.Properties.No_stdlibs) { for _, stdlib := range config.Stdlibs { - // If we're building for the primary host target, use the compiler's stdlibs - if ctx.Host() && ctx.TargetPrimary() { + // If we're building for the primary arch of the build host, use the compiler's stdlibs + if ctx.Target().Os == android.BuildOs && ctx.TargetPrimary() { stdlib = stdlib + "_" + ctx.toolchain().RustTriple() } diff --git a/rust/rust.go b/rust/rust.go index 5c6cdb792..950919904 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -559,21 +559,6 @@ func (mod *Module) Init() android.Module { android.InitAndroidArchModule(mod, mod.hod, mod.multilib) 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 }