diff options
Diffstat (limited to 'cc/sanitize.go')
| -rw-r--r-- | cc/sanitize.go | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go index dc073817b..8e2d16183 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -630,15 +630,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { // Also disable CFI for VNDK variants of components if ctx.isVndk() && ctx.useVndk() { - if ctx.static() { - // Cfi variant for static vndk should be captured as vendor snapshot, - // so don't strictly disable Cfi. - s.Cfi = nil - s.Diag.Cfi = nil - } else { - s.Cfi = nil - s.Diag.Cfi = nil - } + s.Cfi = nil + s.Diag.Cfi = nil } // HWASan ramdisk (which is built from recovery) goes over some bootloader limit. @@ -1168,10 +1161,12 @@ func (s *sanitizerSplitMutator) Split(ctx android.BaseModuleContext) []string { //TODO: When Rust modules have vendor support, enable this path for PlatformSanitizeable // Check if it's a snapshot module supporting sanitizer - if ss, ok := c.linker.(snapshotSanitizer); ok && ss.isSanitizerAvailable(s.sanitizer) { - return []string{"", s.sanitizer.variationName()} - } else { - return []string{""} + if ss, ok := c.linker.(snapshotSanitizer); ok { + if ss.isSanitizerAvailable(s.sanitizer) { + return []string{"", s.sanitizer.variationName()} + } else { + return []string{""} + } } } |