diff options
| -rw-r--r-- | cc/builder.go | 2 | ||||
| -rw-r--r-- | cc/cc.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cc/builder.go b/cc/builder.go index a88df888..cec00564 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -205,7 +205,7 @@ var ( distAbiDiffDir := android.PathForDist(ctx, "abidiffs") commandStr += "|| (echo ' ---- Please update abi references by running platform/development/vndk/tools/header-checker/utils/create_reference_dumps.py -l ${libName} ----'" if distAbiDiffDir.Valid() { - commandStr += ") && (mkdir -p " + distAbiDiffDir.String() + " && cp ${out} " + distAbiDiffDir.String() + commandStr += " && (mkdir -p " + distAbiDiffDir.String() + " && cp ${out} " + distAbiDiffDir.String() + ")" } commandStr += " && exit 1)" return blueprint.RuleParams{ @@ -539,13 +539,14 @@ func (ctx *moduleContextImpl) isVndkExt() bool { // 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 { |