From 8f303934e89b89fd2aad31defe606e0a74138ae1 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Wed, 13 Jun 2018 22:32:16 +0800 Subject: 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 ef1ff3de9804d8e99df06f0874c974b3f1e85e36) Signed-off-by: Jayant Chowdhary (cherry picked from commit 39299e61610198b3d3c511a58ea540471d8e29c2) --- cc/cc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cc/cc.go') diff --git a/cc/cc.go b/cc/cc.go index ca3f8726..51ac1840 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -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 { -- cgit v1.2.3