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

Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Soong)"" am: f895051c85

Browse Source 
am: 4c12a7b54e

Change-Id: I0d722f04c8ceb1e6f19155412fa386ffa530532b
This commit is contained in:
Vishwath Mohan
2018-03-30 03:12:32 +00:00
committed by android-build-merger
parent af27f750e3 4c12a7b54e
commit d86d9f2cbf
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/sanitize.go
View File

@@ -226,13 +226,9 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
// Enable CFI for all components in the include paths
if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
// 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)
}
s.Cfi = boolPtr(true)
if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {
s.Diag.Cfi = boolPtr(true)
}
}