commit 1ce7bf12b71780762b4883b2bc530904961f3f30
author Jayant Chowdhary <jchowdhary@google.com> Sat Mar 03 02:48:21 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 03 02:48:21 2018 +0000
tree 28dde0f865b248790a527b64a104c916a61c0e80
parent eccf4774b120a957ca89c000f7141749fc20f001
parent ea0a2e1928fd2a3ae14e38ee2a92adc4bd58d446

Disable abi diffs for sanitized variants of modules.
am: ea0a2e1928

Change-Id: I790236678fea78c379ab1d7c32e8a5ae2cd0446b

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 {