commit 215cedde6a6243bf5203bcd1e15e4a2d6bbc7182
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 27 22:48:40 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 27 22:48:40 2018 +0000
tree bb8f8bafce3437a1fe0c8161b1b59772ee8c3306
parent 055fa016935a6b291109e12e184f2c108120a613
parent fa920fabdae4c7ec4a4625614878ec86415e42c7

Merge "Fix omission of llndk libraries during abi dump creation."

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 371ea1d..b9c589a 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -545,7 +545,7 @@
 		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 {