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

Commit 39299e61 authored by Logan Chien's avatar Logan Chien Committed by Jayant Chowdhary
Browse files

Fix VNDK-Ext ABI check regression 



VNDK-Ext are modules with `vndk.enabled: true` but not having
`vendor_available: true`.  In addition, VNDK-Ext should be checked by
source ABI checker.  This change fixes the regression introduced in

Bug: 110142940
Test: Create libminijail_ext, break some ABIs, and see an error.
Merged-In: I8b47ac12d2e132f641129c9549ed22c3971d6c89
Change-Id: I8b47ac12d2e132f641129c9549ed22c3971d6c89
(cherry picked from commit ef1ff3de)
Signed-off-by: default avatarJayant Chowdhary <jchowdhary@google.com>
parent 19b17426

cc/cc.go

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