diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2018-04-18 18:08:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-18 18:08:00 +0000 |
| commit | 31db990217b3dc51842fe86218b2fc74dc3faeaf (patch) | |
| tree | b11153b942af8723328fbfba08715dd4efdc40fe /cc | |
| parent | 8328367c44085b948c003116c0ed74a047237a69 (diff) | |
| parent | 0e5afde2f6f69662307e67e53575e0ccb6237430 (diff) | |
| download | build_soong-31db990217b3dc51842fe86218b2fc74dc3faeaf.tar.gz build_soong-31db990217b3dc51842fe86218b2fc74dc3faeaf.tar.bz2 build_soong-31db990217b3dc51842fe86218b2fc74dc3faeaf.zip | |
Merge "Setting SKIP_ABI_CHECKS=true will make soong skip native abi checks." into pi-dev
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc.go | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 { |