diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-24 07:25:10 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-24 07:25:10 +0000 |
| commit | a1f540b3d15fbac96fdfab18608738e32192c69b (patch) | |
| tree | c8cc45d35e6196ca2ba181bf6d868076ba08113d | |
| parent | ece0786e0f65ab2abb464f374fb824193c491c35 (diff) | |
| parent | 165e01b744fe42cf700e388f7e0fb874966a6bfc (diff) | |
| download | build_soong-a1f540b3d15fbac96fdfab18608738e32192c69b.tar.gz build_soong-a1f540b3d15fbac96fdfab18608738e32192c69b.tar.bz2 build_soong-a1f540b3d15fbac96fdfab18608738e32192c69b.zip | |
Snap for 4801384 from 165e01b744fe42cf700e388f7e0fb874966a6bfc to pi-release
Change-Id: I2d863012b6e1bd554d3c41ed841363c2c02a6a5c
| -rw-r--r-- | cc/cc.go | 6 | ||||
| -rw-r--r-- | cc/sanitize.go | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -540,13 +540,13 @@ 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 + isVariantOnProductionDevice := true sanitize := ctx.mod.sanitize if sanitize != nil { - isUnsanitizedVariant = sanitize.isUnsanitizedVariant() + isVariantOnProductionDevice = sanitize.isVariantOnProductionDevice() } vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available) - return !skipAbiChecks && isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries)) + return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries)) } func (ctx *moduleContextImpl) selectedStl() string { diff --git a/cc/sanitize.go b/cc/sanitize.go index 23a7be44..fc44eaf1 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -538,6 +538,11 @@ func (sanitize *sanitize) isUnsanitizedVariant() bool { !sanitize.isSanitizerEnabled(cfi) } +func (sanitize *sanitize) isVariantOnProductionDevice() bool { + return !sanitize.isSanitizerEnabled(asan) && + !sanitize.isSanitizerEnabled(tsan) +} + func (sanitize *sanitize) SetSanitizer(t sanitizerType, b bool) { switch t { case asan: |