Merge "No abi diffing for vndk libraries which are not vendor available." into pi-dev

This commit is contained in:
TreeHugger Robot 2018-03-07 21:23:10 +00:00 committed by Android (Google) Code Review
commit d34ca7f986
1 changed files with 2 additions and 1 deletions

View File

@ -535,7 +535,8 @@ func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool {
if sanitize != nil {
isUnsanitizedVariant = sanitize.isUnsanitizedVariant()
}
return isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk()) || inList(ctx.baseModuleName(), llndkLibraries))
vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available)
return vendorAvailable && isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk()) || inList(ctx.baseModuleName(), llndkLibraries))
}
func (ctx *moduleContextImpl) selectedStl() string {