Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 165e01b7 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by Android (Google) Code Review
Browse files

Merge "Allow abi diffs sanitized variants of vndk libraries on production devices." into pi-dev

parents 683444e4 f267f715

cc/cc.go

+3 −3
Original line number Diff line number Diff line
@@ -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 {

cc/sanitize.go

+5 −0
Original line number Diff line number Diff line
@@ -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: