diff options
| author | Logan Chien <loganchien@google.com> | 2018-06-13 22:32:16 +0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-18 23:33:44 +0000 |
| commit | 8f303934e89b89fd2aad31defe606e0a74138ae1 (patch) | |
| tree | 0389234c7461d39dc7d89dd521d1df2e66f09900 | |
| parent | ba27e13355e235cea24c0f16f3f5bb23e6dfd88a (diff) | |
| download | build_soong-8f303934e89b89fd2aad31defe606e0a74138ae1.tar.gz build_soong-8f303934e89b89fd2aad31defe606e0a74138ae1.tar.bz2 build_soong-8f303934e89b89fd2aad31defe606e0a74138ae1.zip | |
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>
(cherry picked from commit 39299e61610198b3d3c511a58ea540471d8e29c2)
| -rw-r--r-- | cc/cc.go | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 { |