Merge "Reverse RRO dir paths when passing to Make" into pi-dev
diff --git a/cc/cc.go b/cc/cc.go
index e5eb8d8..50766fa 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -539,13 +539,14 @@
// Create source abi dumps if the module belongs to the list of VndkLibraries.
func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool {
+ skipAbiChecks := ctx.ctx.Config().IsEnvTrue("SKIP_ABI_CHECKS")
isUnsanitizedVariant := true
sanitize := ctx.mod.sanitize
if sanitize != nil {
isUnsanitizedVariant = sanitize.isUnsanitizedVariant()
}
vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available)
- return isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries))
+ return !skipAbiChecks && isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries))
}
func (ctx *moduleContextImpl) selectedStl() string {