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

Follow all shared library dependencies when collecting JNI libraries

Browse Source 
The implementation before libraryDependencyTag was added failed to
include some JNI libraries into apps because it did not handle
sharedExportDepTag, earlySharedDepTag or lateSharedDepTag.

Also fix a bug in cc.*Module.IsNdk that was comparing "liblog.ndk"
against "liblog" and incorrectly returning false that would have
caused NDK libraries that now pass the check above to incorrectly be
packaged into the APK.

Bug: 162437057
Test: m checkbuild
Change-Id: I02fb745abb5cace2b4e5bfff2f35cef6d2e0a4ff
This commit is contained in:
Colin Cross
2020-07-29 12:59:39 -07:00
parent 4fbb5e0234
commit f0913fb0a0
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc.go
View File

@@ -962,7 +962,7 @@ func (c *Module) isCoverageVariant() bool {
}
func (c *Module) IsNdk() bool {
return inList(c.Name(), ndkKnownLibs)
return inList(c.BaseModuleName(), ndkKnownLibs)
}
func (c *Module) isLlndk(config android.Config) bool {