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

Commit 695da738 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by android-build-merger
Browse files

Merge "Fix VNDK-Ext ABI check regression" 

am: 4038a6ea

Change-Id: I51230cf8c0f72b3492eea1fa042228c77dd1f99f
parents 2de6cdce 4038a6ea

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool { 
		isVariantOnProductionDevice = sanitize.isVariantOnProductionDevice()

	}

	vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available)

	return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries))

	return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && (vendorAvailable || ctx.isVndkExt())) || inList(ctx.baseModuleName(), llndkLibraries))

}



func (ctx *moduleContextImpl) selectedStl() string {