commit d34ca7f986ca16c074f9214e7dc839774d0210d6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 07 21:23:10 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 07 21:23:10 2018 +0000
tree ae08a5636a7c4bf532a464831ce2c317f5de94cb
parent 28f56ee5d6ac2b29a99f1e0908e373106be597d2
parent bb0a8bd5ee808436f1e4a7457c66206a49250afa

Merge "No abi diffing for vndk libraries which are not vendor available." into pi-dev

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index a58a84d..91bf9a6 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -535,7 +535,8 @@
 	if sanitize != nil {
 		isUnsanitizedVariant = sanitize.isUnsanitizedVariant()
 	}
-	return isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk()) || inList(ctx.baseModuleName(), llndkLibraries))
+	vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available)
+	return vendorAvailable && isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk()) || inList(ctx.baseModuleName(), llndkLibraries))
 }
 
 func (ctx *moduleContextImpl) selectedStl() string {