StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow abi diffs sanitized variants of vndk libraries on production devices."

Browse Source 
am: ce617bbbdb

Change-Id: I9638b92af5cf9fbc87ebf4076c4a8ff84a56a540
This commit is contained in:
Jayant Chowdhary
2018-05-14 17:06:01 -07:00
committed by android-build-merger
parent 87e61f5667 ce617bbbdb
commit 516bc12773
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/cc.go
View File

@@ -552,13 +552,13 @@ func (ctx *moduleContextImpl) isVndkExt() bool {
// Create source abi dumps if the module belongs to the list of VndkLibraries. // Create source abi dumps if the module belongs to the list of VndkLibraries.
func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool { func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool {
skipAbiChecks := ctx.ctx.Config().IsEnvTrue("SKIP_ABI_CHECKS") skipAbiChecks := ctx.ctx.Config().IsEnvTrue("SKIP_ABI_CHECKS")
isUnsanitizedVariant := true isVariantOnProductionDevice := true
sanitize := ctx.mod.sanitize sanitize := ctx.mod.sanitize
if sanitize != nil { if sanitize != nil {
isUnsanitizedVariant = sanitize.isUnsanitizedVariant() isVariantOnProductionDevice = sanitize.isVariantOnProductionDevice()
} }
vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available) 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 { func (ctx *moduleContextImpl) selectedStl() string {

5
cc/sanitize.go
View File

@@ -539,6 +539,11 @@ func (sanitize *sanitize) isUnsanitizedVariant() bool {
!sanitize.isSanitizerEnabled(cfi) !sanitize.isSanitizerEnabled(cfi)
} }
func (sanitize *sanitize) isVariantOnProductionDevice() bool {
return !sanitize.isSanitizerEnabled(asan) &&
!sanitize.isSanitizerEnabled(tsan)
}
func (sanitize *sanitize) SetSanitizer(t sanitizerType, b bool) { func (sanitize *sanitize) SetSanitizer(t sanitizerType, b bool) {
switch t { switch t {
case asan: case asan: