From 0e5afde2f6f69662307e67e53575e0ccb6237430 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Mon, 29 Jan 2018 15:01:20 -0800 Subject: [PATCH] Setting SKIP_ABI_CHECKS=true will make soong skip native abi checks. Bug: 78118272 Bug: 72225642 Test: SKIP_ABI_CHECKS=true mm -j64 in external/libjpeg-turbo; no abi dumping / diffing happens Test: SKIP_ABI_CHECKS=false mm -j64 in external/libjpeg-turbo; abi dumping / diffing happens Test: SKIP_ABI_CHECKS=foo mm -j64 in external/libjpeg-turbo; abi dumping / diffing happens Merged-In: I6330bc6de81abd589e78572af8efdf70d4c69b80 Change-Id: I6330bc6de81abd589e78572af8efdf70d4c69b80 (cherry picked from commit b391feaea59a3cec706237b1b980036512843a8d) --- cc/cc.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cc/cc.go b/cc/cc.go index e5eb8d8b3..50766fa0b 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -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 {