aboutsummaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-03-07 21:23:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-07 21:23:10 +0000
commitd34ca7f986ca16c074f9214e7dc839774d0210d6 (patch)
treeae08a5636a7c4bf532a464831ce2c317f5de94cb /cc
parent28f56ee5d6ac2b29a99f1e0908e373106be597d2 (diff)
parentbb0a8bd5ee808436f1e4a7457c66206a49250afa (diff)
downloadbuild_soong-d34ca7f986ca16c074f9214e7dc839774d0210d6.tar.gz
build_soong-d34ca7f986ca16c074f9214e7dc839774d0210d6.tar.bz2
build_soong-d34ca7f986ca16c074f9214e7dc839774d0210d6.zip
Merge "No abi diffing for vndk libraries which are not vendor available." into pi-dev
Diffstat (limited to 'cc')
-rw-r--r--cc/cc.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/cc.go b/cc/cc.go
index a58a84de..91bf9a6d 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -535,7 +535,8 @@ func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool {
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 {