tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Propagate runtime_libs from Soong to Make

Browse source 
Write the list of a module's runtime-required libraries to the
`LOCAL_RUNTIME_LIBRARIES` Makefile variable defined for each module.
This enables downstream tools to correctly set up the runtime environment
for execution.


Bug: 215243373
Test: out/soong/Android-aosp_cf_x86_64_phone.mk

Change-Id: Ia64a75cfba27af0202973d749d02620b355ec802
This commit is contained in:
yangbill 2022-02-08 16:14:25 +08:00 committed by Bill Yang
parent 3cb45a5f4a
commit 6db86e5f01
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cc/androidmk.go
View file

@ -108,6 +108,9 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
if len(c.Properties.AndroidMkHeaderLibs) > 0 { if len(c.Properties.AndroidMkHeaderLibs) > 0 {
entries.AddStrings("LOCAL_HEADER_LIBRARIES", c.Properties.AndroidMkHeaderLibs...) entries.AddStrings("LOCAL_HEADER_LIBRARIES", c.Properties.AndroidMkHeaderLibs...)
} }
if len(c.Properties.AndroidMkRuntimeLibs) > 0 {
entries.AddStrings("LOCAL_RUNTIME_LIBRARIES", c.Properties.AndroidMkRuntimeLibs...)
}
entries.SetString("LOCAL_SOONG_LINK_TYPE", c.makeLinkType) entries.SetString("LOCAL_SOONG_LINK_TYPE", c.makeLinkType)
if c.UseVndk() { if c.UseVndk() {
entries.SetBool("LOCAL_USE_VNDK", true) entries.SetBool("LOCAL_USE_VNDK", true)