From 31f1bb80efe196f2340ec88a6cc374963e7aa7b5 Mon Sep 17 00:00:00 2001 From: Thiébaud Weksteen Date: Thu, 27 Aug 2020 13:37:29 +0200 Subject: rust: add ccToolchain to Module The cc toolchain information is required when using cc.Stripper. Move to a Module method to avoid importing the cc package everywhere. Test: m nothing Bug: 153430439 Change-Id: I497dcdff4e767ecb8b8688c73cf88850c302683d --- rust/rust.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'rust/rust.go') diff --git a/rust/rust.go b/rust/rust.go index 68dc5a08b..90329502d 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -23,6 +23,7 @@ import ( "android/soong/android" "android/soong/cc" + cc_config "android/soong/cc/config" "android/soong/rust/config" ) @@ -656,6 +657,10 @@ func (mod *Module) toolchain(ctx android.BaseModuleContext) config.Toolchain { return mod.cachedToolchain } +func (mod *Module) ccToolchain(ctx android.BaseModuleContext) cc_config.Toolchain { + return cc_config.FindToolchain(ctx.Os(), ctx.Arch()) +} + func (d *Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) { } -- cgit v1.2.3-59-g8ed1b