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

Merge "Enable HWASan for multiple modules in one place(Soong)"

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-29 00:10:16 +00:00
committed by Gerrit Code Review
parent e605b39e61 a98aab98c4
commit 2f6179d4f5
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/config.go
View File

@@ -1571,6 +1571,13 @@ func (c *config) MemtagHeapSyncEnabledForPath(path string) bool {
return HasAnyPrefix(path, c.productVariables.MemtagHeapSyncIncludePaths) && !c.MemtagHeapDisabledForPath(path) return HasAnyPrefix(path, c.productVariables.MemtagHeapSyncIncludePaths) && !c.MemtagHeapDisabledForPath(path)
} }
func (c *config) HWASanEnabledForPath(path string) bool {
if len(c.productVariables.HWASanIncludePaths) == 0 {
return false
}
return HasAnyPrefix(path, c.productVariables.HWASanIncludePaths)
}
func (c *config) VendorConfig(name string) VendorConfig { func (c *config) VendorConfig(name string) VendorConfig {
return soongconfig.Config(c.productVariables.VendorVars[name]) return soongconfig.Config(c.productVariables.VendorVars[name])
} }

2
android/variable.go
View File

@@ -307,6 +307,8 @@ type productVariables struct {
MemtagHeapAsyncIncludePaths []string `json:",omitempty"` MemtagHeapAsyncIncludePaths []string `json:",omitempty"`
MemtagHeapSyncIncludePaths []string `json:",omitempty"` MemtagHeapSyncIncludePaths []string `json:",omitempty"`
HWASanIncludePaths []string `json:",omitempty"`
VendorPath *string `json:",omitempty"` VendorPath *string `json:",omitempty"`
OdmPath *string `json:",omitempty"` OdmPath *string `json:",omitempty"`
ProductPath *string `json:",omitempty"` ProductPath *string `json:",omitempty"`

6
cc/sanitize.go
View File

@@ -593,6 +593,12 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
} }
} }
// Enable HWASan for all components in the include paths (for Aarch64 only)
if s.Hwaddress == nil && ctx.Config().HWASanEnabledForPath(ctx.ModuleDir()) &&
ctx.Arch().ArchType == android.Arm64 && ctx.toolchain().Bionic() {
s.Hwaddress = proptools.BoolPtr(true)
}
// Enable CFI for non-host components in the include paths // Enable CFI for non-host components in the include paths
if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) && !ctx.Host() { if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) && !ctx.Host() {
s.Cfi = proptools.BoolPtr(true) s.Cfi = proptools.BoolPtr(true)