Merge "No abi diffing for vndk libraries which are not vendor available." am: 72ce0643b0

am: 21e5d301a6

Change-Id: Ic964b825e407f4d4c3c8e4c393dd0ad5d281bbd6
This commit is contained in:
Jayant Chowdhary
2018-03-07 02:11:43 +00:00
committed by android-build-merger

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 {