Merge "No abi diffing for vndk libraries which are not vendor available." into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d34ca7f986
3
cc/cc.go
3
cc/cc.go
@@ -535,7 +535,8 @@ func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool {
|
|||||||
if sanitize != nil {
|
if sanitize != nil {
|
||||||
isUnsanitizedVariant = sanitize.isUnsanitizedVariant()
|
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 {
|
func (ctx *moduleContextImpl) selectedStl() string {
|
||||||
|
Reference in New Issue
Block a user