Merge "Reland "Also package recursive jni_libs deps of android_apps as well as direct deps." with bug fix."

This commit is contained in:
Peter Collingbourne
2019-12-18 23:29:58 +00:00
committed by Gerrit Code Review
5 changed files with 69 additions and 22 deletions

View File

@@ -755,7 +755,7 @@ func (c *Module) isCoverageVariant() bool {
return c.coverage.Properties.IsCoverageVariant
}
func (c *Module) isNdk() bool {
func (c *Module) IsNdk() bool {
return inList(c.Name(), ndkMigratedLibs)
}
@@ -995,7 +995,7 @@ func (ctx *moduleContextImpl) useVndk() bool {
}
func (ctx *moduleContextImpl) isNdk() bool {
return ctx.mod.isNdk()
return ctx.mod.IsNdk()
}
func (ctx *moduleContextImpl) isLlndk(config android.Config) bool {