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

Merge "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Soong)"

Browse Source
This commit is contained in:
Treehugger Robot
2018-03-29 22:55:35 +00:00
committed by Gerrit Code Review
parent b1703659a8 289d548c3e
commit 3ab49a2927
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/sanitize.go
View File

@@ -226,9 +226,13 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
// Enable CFI for all components in the include paths
if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
s.Cfi = boolPtr(true)
if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {
s.Diag.Cfi = boolPtr(true)
// Do not rely on include paths for anything other than ARM64.
// TODO: Relax this constraint for 2019.
if ctx.Arch().ArchType == android.Arm64 {
s.Cfi = boolPtr(true)
if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {
s.Diag.Cfi = boolPtr(true)
}
}
}