commit 4c26b7818359207371fb26151a81854ab056d681
author Jayant Chowdhary <jchowdhary@google.com> Sat Mar 03 03:03:24 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 03 03:03:24 2018 +0000
tree 500b9458588c4b4d87312b00bd90d83d70457849
parent 8b9897b1430c607d573c929b9cd03545eb664730
parent 2c3225a1ac2b365c49b88617ee830f55e5ff336b

Disable abi diffs for sanitized variants of modules. am: ea0a2e1928 am: 1ce7bf12b7
am: 2c3225a1ac

Change-Id: I157a6665d1799792472dcf184e125c256ab1fc5a

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 887f394..a58a84d 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -530,7 +530,12 @@
 
 // Create source abi dumps if the module belongs to the list of VndkLibraries.
 func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool {
-	return ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk()) || inList(ctx.baseModuleName(), llndkLibraries))
+	isUnsanitizedVariant := true
+	sanitize := ctx.mod.sanitize
+	if sanitize != nil {
+		isUnsanitizedVariant = sanitize.isUnsanitizedVariant()
+	}
+	return isUnsanitizedVariant && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk()) || inList(ctx.baseModuleName(), llndkLibraries))
 }
 
 func (ctx *moduleContextImpl) selectedStl() string {