Merge "Propagate runtime_libs from Soong to Make" am: b451101f6e

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1976466

Change-Id: I4c37eaa4a707db146ee46a064cbc283387a033ef
This commit is contained in:
Treehugger Robot
2022-02-11 01:01:14 +00:00
committed by Automerger Merge Worker

View File

@@ -108,6 +108,9 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
if len(c.Properties.AndroidMkHeaderLibs) > 0 {
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)
if c.UseVndk() {
entries.SetBool("LOCAL_USE_VNDK", true)