Merge 6b81740e988efd86522e4f19ceb5c2c239fb445a on remote branch

Change-Id: Id798c9f972162c5ac1eb1d9db8f4e4fc932061ea

1 files changed, 5 insertions, 0 deletions

diff --git a/cc/vendor_snapshot.go b/cc/vendor_snapshot.go
index 6a49a3270..8580cf90d 100644
--- a/cc/vendor_snapshot.go
+++ b/cc/vendor_snapshot.go
@@ -100,6 +100,11 @@ func isSnapshotAware(cfg android.DeviceConfig, m LinkableInterface, inProprietar
 			if !sanitizable.Shared() && sanitizable.IsSanitizerEnabled(scs) {
 				return false
 			}
+			// cfi and hwasan cannot be enabled at the same time.
+			// Skip variants that have both cfi and hwasan enabled.
+			if sanitizable.IsSanitizerEnabled(cfi) && sanitizable.IsSanitizerEnabled(Hwasan) {
+				return false
+			}
 			// cfi and hwasan also export both variants. But for static, we capture both.
 			// This is because cfi static libraries can't be linked from non-cfi modules,
 			// and vice versa.