diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-30 07:26:05 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-30 07:26:05 +0000 |
| commit | 2a9b6508c2a18fa367e9b641fea6a95d2287132b (patch) | |
| tree | f50e38744fd892ff9b4469695f4bf6532784af68 | |
| parent | aa3ed2a3f61c48ac75e5bf5aba02d8c599eb93ef (diff) | |
| parent | 9ccbba0200cf56cc6b1b09bc45fa2efb1ea9a411 (diff) | |
| download | build_soong-2a9b6508c2a18fa367e9b641fea6a95d2287132b.tar.gz build_soong-2a9b6508c2a18fa367e9b641fea6a95d2287132b.tar.bz2 build_soong-2a9b6508c2a18fa367e9b641fea6a95d2287132b.zip | |
Snap for 4810559 from 9ccbba0200cf56cc6b1b09bc45fa2efb1ea9a411 to pi-release
Change-Id: I3881547af30a519049efbb05601ab3a9cb44b43a
| -rw-r--r-- | cc/sanitize.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go index 881a5a01..de970352 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -256,9 +256,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { s.Diag.Cfi = nil } - // Also disable CFI for VNDK variants of components in the - // include paths - if ctx.isVndk() && ctx.useVndk() && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) { + // Also disable CFI for VNDK variants of components + if ctx.isVndk() && ctx.useVndk() { s.Cfi = nil s.Diag.Cfi = nil } |