Allow cfi enabled modules in mixed build.

Bug: None
Test: Locally tested
Change-Id: I53c4ad8428cf05ceee3d73b4f97c2b9db2285c38
This commit is contained in:
Yu Liu
2023-05-25 11:15:07 -07:00
parent 331c7d77c4
commit 95497dc89b
2 changed files with 3 additions and 2 deletions

View File

@@ -1916,7 +1916,6 @@ func allEnabledSanitizersSupportedByBazel(c *Module) bool {
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 @@ func allEnabledSanitizersSupportedByBazel(c *Module) bool {
if ubsanEnabled && !c.MinimalRuntimeNeeded() {
return false
}
} else if san == cfi {
continue
} else if c.sanitize.isSanitizerEnabled(san) {
return false
}