StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add option to disable Scudo globally [Soong]"

Browse Source
This commit is contained in:
Kostya Kortchinsky
2019-02-05 14:45:39 +00:00
committed by Gerrit Code Review
parent b7c24df220 d5275c8657
commit 66b1193d55
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -665,6 +665,10 @@ func (c *config) EnableCFI() bool {
} }
} }
func (c *config) DisableScudo() bool {
return Bool(c.productVariables.DisableScudo)
}
func (c *config) EnableXOM() bool { func (c *config) EnableXOM() bool {
if c.productVariables.EnableXOM == nil { if c.productVariables.EnableXOM == nil {
return true return true

2
android/variable.go
View File

@@ -213,6 +213,8 @@ type productVariables struct {
CFIExcludePaths []string `json:",omitempty"` CFIExcludePaths []string `json:",omitempty"`
CFIIncludePaths []string `json:",omitempty"` CFIIncludePaths []string `json:",omitempty"`
DisableScudo *bool `json:",omitempty"`
EnableXOM *bool `json:",omitempty"` EnableXOM *bool `json:",omitempty"`
XOMExcludePaths []string `json:",omitempty"` XOMExcludePaths []string `json:",omitempty"`

4
cc/sanitize.go
View File

@@ -370,8 +370,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
sanitize.Properties.SanitizerEnabled = true sanitize.Properties.SanitizerEnabled = true
} }
// Disable Scudo if ASan or TSan is enabled. // Disable Scudo if ASan or TSan is enabled, or if it's disabled globally.
if Bool(s.Address) || Bool(s.Thread) || Bool(s.Hwaddress) { if Bool(s.Address) || Bool(s.Thread) || Bool(s.Hwaddress) || ctx.Config().DisableScudo() {
s.Scudo = nil s.Scudo = nil
} }