Merge changes I02fb745a,Iccc96c0d

* changes:
  Follow all shared library dependencies when collecting JNI libraries
  Handle static unwinder in ltoDepsMutator
This commit is contained in:
Colin Cross
2020-08-13 21:55:53 +00:00
committed by Gerrit Code Review
3 changed files with 3 additions and 7 deletions

View File

@@ -969,7 +969,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 {