commit 39299e61610198b3d3c511a58ea540471d8e29c2
author Logan Chien <loganchien@google.com> Wed Jun 13 22:32:16 2018 +0800
committer Jayant Chowdhary <jchowdhary@google.com> Wed Jun 13 10:56:10 2018 -0700
tree 0389234c7461d39dc7d89dd521d1df2e66f09900
parent 19b1742614570b0debcdd13238917126924d321c

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 <jchowdhary@google.com>

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index ca3f872..51ac184 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -546,7 +546,7 @@
 		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 {