Merge "Allow cfi enabled modules in mixed build."

This commit is contained in:
Yu Liu
2023-06-06 17:41:18 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 2 deletions

View File

@@ -1928,7 +1928,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),
@@ -1947,6 +1946,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
}

View File

@@ -5538,7 +5538,7 @@ func TestDisableSanitizerVariantsInMixedBuilds(t *testing.T) {
name: "foo_cfi",
variant: "android_arm64_armv8-a_static_cfi_apex28",
expectedOutputPaths: []string{
"out/soong/.intermediates/foo_cfi/android_arm64_armv8-a_static_cfi_apex28/foo_cfi.a",
"outputbase/execroot/__main__/foo_cfi.a",
},
},
{