From 1c54f66bd56d00592b6ce55826411ae6af9e2697 Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Thu, 24 May 2018 18:36:18 -0700 Subject: Restrict CFI_INCLUDE_PATHS to Arm64 This CL restricts CFI_INCLUDE_PATHS and PRODUCT_CFI_INCLUDE_PATHS to Arm64 only. Bug: 66301104 Test: x86 targets do not respect the include paths variables Change-Id: I66ec2fb05435535aaf5d59fdfc7a170a4fdd4f26 --- cc/sanitize.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index 205b2a20..881a5a01 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -224,8 +224,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { } } - // Enable CFI for all components in the include paths - if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) { + // Enable CFI for all components in the include paths (for Aarch64 only) + if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) && ctx.Arch().ArchType == android.Arm64 { s.Cfi = boolPtr(true) if inList("cfi", ctx.Config().SanitizeDeviceDiag()) { s.Diag.Cfi = boolPtr(true) -- cgit v1.2.3