diff options
author | Jayant Chowdhary <jchowdhary@google.com> | 2018-03-27 11:10:57 -0700 |
---|---|---|
committer | Jayant Chowdhary <jchowdhary@google.com> | 2018-03-28 10:10:33 -0700 |
commit | 604936801436ca6d726f490e53c04bb23ffdf799 (patch) | |
tree | b453d14d6f6e33f02501d9b7cdbfe026647b3249 | |
parent | 9c9894febfc433302df8dfe6af76ea88c5ef6cee (diff) | |
download | build_soong-604936801436ca6d726f490e53c04bb23ffdf799.tar.gz build_soong-604936801436ca6d726f490e53c04bb23ffdf799.tar.bz2 build_soong-604936801436ca6d726f490e53c04bb23ffdf799.zip |
Fix omission of llndk libraries during abi dump creation.
We omit vendor unavailable modules. This should not apply to llndk
libraries since currently, we do abi checks on their system variants.
Bug: 77101345
Test: m -j libc creates libc.so.lsdump
Test: m -j libjpeg.vendor creates libjpeg.so.lsdump
Test: m -j external/cblas still does not create libblas.so.lsdump
Merged-In: I5522c1cd471bfba8a1f632270ab2f167b4b17117
Change-Id: I5522c1cd471bfba8a1f632270ab2f167b4b17117
(cherry picked from commit fa920fabdae4c7ec4a4625614878ec86415e42c7)
-rw-r--r-- | cc/cc.go | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -538,7 +538,7 @@ func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool { isUnsanitizedVariant = sanitize.isUnsanitizedVariant() } vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available) - return vendorAvailable && isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk()) || inList(ctx.baseModuleName(), llndkLibraries)) + return isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries)) } func (ctx *moduleContextImpl) selectedStl() string { |