From c08897c1e442be2e0f6db99ca310c9dc7c2e3194 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Fri, 2 Apr 2021 12:41:32 -0400 Subject: Add more Rust vendor image support. This adds Rust vendor image support for all module types except Rust prebuilts. Bug: 184042776 Test: New Soong tests. Test: Example cc_library vendor module can depend on rust_ffi_shared. Test: Example rust_library vendor-only module compiles. Change-Id: Iaa30ad51fdaedcbf14687da5472581f6af62ff59 --- rust/androidmk.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'rust/androidmk.go') diff --git a/rust/androidmk.go b/rust/androidmk.go index dea32a34d..f8ab2aa7b 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -60,6 +60,10 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { entries.AddStrings("LOCAL_SHARED_LIBRARIES", mod.Properties.AndroidMkSharedLibs...) entries.AddStrings("LOCAL_STATIC_LIBRARIES", mod.Properties.AndroidMkStaticLibs...) entries.AddStrings("LOCAL_SOONG_LINK_TYPE", mod.makeLinkType) + if mod.UseVndk() { + entries.SetBool("LOCAL_USE_VNDK", true) + } + }, }, } @@ -75,6 +79,7 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { mod.SubAndroidMk(&ret, mod.sanitize) } + ret.SubName += mod.Properties.RustSubName ret.SubName += mod.Properties.SubName return []android.AndroidMkEntries{ret} -- cgit v1.2.3-59-g8ed1b