Allow cfi enabled modules in mixed build.
Bug: None
Test: Locally tested
Change-Id: I53c4ad8428cf05ceee3d73b4f97c2b9db2285c38
diff --git a/cc/cc.go b/cc/cc.go
index c9f00e2..bafd625 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1916,7 +1916,6 @@
unsupportedSanitizers := []*bool{
sanitizeProps.Safestack,
- sanitizeProps.Cfi,
sanitizeProps.Scudo,
BoolPtr(len(c.sanitize.Properties.Sanitize.Recover) > 0),
BoolPtr(c.sanitize.Properties.Sanitize.Blocklist != nil),
@@ -1935,6 +1934,8 @@
if ubsanEnabled && !c.MinimalRuntimeNeeded() {
return false
}
+ } else if san == cfi {
+ continue
} else if c.sanitize.isSanitizerEnabled(san) {
return false
}