diff options
| author | Vishwath Mohan | 2018-05-24 20:36:18 -0500 |
|---|---|---|
| committer | Vishwath Mohan | 2018-05-24 20:36:18 -0500 |
| commit | 1c54f66bd56d00592b6ce55826411ae6af9e2697 (patch) | |
| tree | 1a9f6b5b81aa28009f67b044776c8de2d8bdfbde | |
| parent | 7589c82eecd4c25279f64464609708ff8400dcb0 (diff) | |
| download | platform-build-soong-1c54f66bd56d00592b6ce55826411ae6af9e2697.tar.gz platform-build-soong-1c54f66bd56d00592b6ce55826411ae6af9e2697.tar.xz platform-build-soong-1c54f66bd56d00592b6ce55826411ae6af9e2697.zip | |
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
| -rw-r--r-- | cc/sanitize.go | 4 |
1 files 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) { | |||
| 224 | } | 224 | } |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | // Enable CFI for all components in the include paths | 227 | // Enable CFI for all components in the include paths (for Aarch64 only) |
| 228 | if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) { | 228 | if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) && ctx.Arch().ArchType == android.Arm64 { |
| 229 | s.Cfi = boolPtr(true) | 229 | s.Cfi = boolPtr(true) |
| 230 | if inList("cfi", ctx.Config().SanitizeDeviceDiag()) { | 230 | if inList("cfi", ctx.Config().SanitizeDeviceDiag()) { |
| 231 | s.Diag.Cfi = boolPtr(true) | 231 | s.Diag.Cfi = boolPtr(true) |