StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I4ee03d4a0a34193c4852bb98b9ed19fb6d63de23
This commit is contained in:
Treehugger Robot
2022-02-11 01:18:26 +00:00
committed by Automerger Merge Worker
parent 4116d924a8 7966092c95
commit 3489f67ca8
1 changed files with 3 additions and 0 deletions
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)