diff options
| author | 2020-12-02 09:15:16 -0500 | |
|---|---|---|
| committer | 2020-12-10 10:29:54 -0500 | |
| commit | 6a88443089849454d45135f18d32183afd122b93 (patch) | |
| tree | f45bfedf9346aa13d74ee4763c896744a305a065 /rust/androidmk.go | |
| parent | f9e2172aec5c3d890337e568152b3c2e758a1527 (diff) | |
Rust: Vendor support for Rust static libraries.
We don't have Rust VNDK support yet, but static linkage can be
supported in the interim. This adds support for making rust_ffi_static
libraries available to CC vendor modules.
Since rust_ffi_static modules will link against rlibs, we allow rlib
linkage into vendor as well, but only for the variants which use the
rlib libstd.
Bug: 172525289
Test: New Soong tests pass
Test: Example vendor cc_binary links against rust_ffi_static module.
Change-Id: Idf3aeb51e32293866f1ad965e329aa6b9e0bf2ef
Diffstat (limited to 'rust/androidmk.go')
| -rw-r--r-- | rust/androidmk.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rust/androidmk.go b/rust/androidmk.go index c181d676e..e9da6fabe 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -58,6 +58,7 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { entries.AddStrings("LOCAL_PROC_MACRO_LIBRARIES", mod.Properties.AndroidMkProcMacroLibs...) entries.AddStrings("LOCAL_SHARED_LIBRARIES", mod.Properties.AndroidMkSharedLibs...) entries.AddStrings("LOCAL_STATIC_LIBRARIES", mod.Properties.AndroidMkStaticLibs...) + entries.AddStrings("LOCAL_SOONG_LINK_TYPE", mod.makeLinkType) }, }, } |