Merge "Fix VNDK-Ext ABI check regression"

This commit is contained in:
Jayant Chowdhary
2018-06-13 17:54:03 +00:00
committed by Gerrit Code Review

View File

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