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

soong: Exclude system shared libs from fix suggestions

Browse Source 
Pass the value of system_shared_libs to the Android.mk world, so that
prebuilt ELF check can exclude them from fix suggestions.

Bug: 141925662
Test: Write a bad cc_prebuilt_library module and check fix suggestions
Change-Id: I0cc61821765507180ce6a582bf8125a192f83a57
This commit is contained in:
Yo Chiang
2020-09-22 18:45:04 +08:00
parent cc79a6f514
commit 219968c9b3
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/androidmk.go
View File

@@ -83,6 +83,13 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
if len(c.Properties.Logtags) > 0 {
entries.AddStrings("LOCAL_LOGTAGS_FILES", c.Properties.Logtags...)
}
// Note: Pass the exact value of AndroidMkSystemSharedLibs to the Make
// world, even if it is an empty list. In the Make world,
// LOCAL_SYSTEM_SHARED_LIBRARIES defaults to "none", which is expanded
// to the default list of system shared libs by the build system.
// Soong computes the exact list of system shared libs, so we have to
// override the default value when the list of libs is actually empty.
entries.SetString("LOCAL_SYSTEM_SHARED_LIBRARIES", strings.Join(c.Properties.AndroidMkSystemSharedLibs, " "))
if len(c.Properties.AndroidMkSharedLibs) > 0 {
entries.AddStrings("LOCAL_SHARED_LIBRARIES", c.Properties.AndroidMkSharedLibs...)
}