diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 17:23:22 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 17:23:26 -0700 |
| commit | 6bfe4eb42c79d4930a71ba5ad013177b1741713f (patch) | |
| tree | 2246bd09c86a770d1a4d26b415eed543affb7df6 /cc/sanitize.go | |
| parent | 77a69ecb70765f09f40c249a1546b5de7b2ee7f8 (diff) | |
| parent | 7481ee6e6d144a509a931a80d0453ad74fb5b815 (diff) | |
| download | build_soong-android-o-mr1-iot-release-1.0.3.tar.gz build_soong-android-o-mr1-iot-release-1.0.3.tar.bz2 build_soong-android-o-mr1-iot-release-1.0.3.zip | |
Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3
Bug: 112104996
Change-Id: I160274b2c2bbe8219ed9a3b5d39c3935bfcb13f0
Diffstat (limited to 'cc/sanitize.go')
| -rw-r--r-- | cc/sanitize.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go index 4c8a6114..1037181d 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -236,8 +236,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) @@ -272,6 +272,12 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { s.Integer_overflow = nil } + // Also disable CFI for VNDK variants of components + if ctx.isVndk() && ctx.useVndk() { + s.Cfi = nil + s.Diag.Cfi = nil + } + if ctx.staticBinary() { s.Address = nil s.Coverage = nil |