1 files changed, 6 insertions, 1 deletions
diff --git a/cc/cc.go b/cc/cc.go
index 887f3943..a58a84de 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -530,7 +530,12 @@ func (ctx *moduleContextImpl) isVndkExt() bool {
 
 // 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 {