Add option to disable Scudo globally [Soong]
This adds an option in Soong to turn off Scudo globally.
Bug: 123228023
Test: enable Scudo for tombstoned, lunch marlin_svelte-eng && m -j, and
make sure that Scudo is not linked in
out/target/product/marlin/system/bin/tombstoned
Test: enable Scudo for tombstoned, lunch marlin-userdebug && m -j, and
make sure that Scudo is linked in
out/target/product/marlin/system/bin/tombstoned
Change-Id: I0b0992446953fc4074bde94507b66f92764c8143
Merged-In: I0b0992446953fc4074bde94507b66f92764c8143
diff --git a/cc/sanitize.go b/cc/sanitize.go
index c13b855..bcc4de3 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -370,8 +370,8 @@
sanitize.Properties.SanitizerEnabled = true
}
- // Disable Scudo if ASan or TSan is enabled.
- if Bool(s.Address) || Bool(s.Thread) || Bool(s.Hwaddress) {
+ // Disable Scudo if ASan or TSan is enabled, or if it's disabled globally.
+ if Bool(s.Address) || Bool(s.Thread) || Bool(s.Hwaddress) || ctx.Config().DisableScudo() {
s.Scudo = nil
}