Merge "Fix omission of llndk libraries during abi dump creation."

This commit is contained in:
Treehugger Robot
2018-03-27 22:48:40 +00:00
committed by Gerrit Code Review

View File

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