diff options
| author | Jiyong Park <jiyong@google.com> | 2019-01-29 00:29:06 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-29 00:29:06 -0800 |
| commit | 4c47d6013d14b50701d5a7e2b67b9f83cc7115c1 (patch) | |
| tree | d476a349c041ceb6287bd1e7654323d21d1ba1ea /cc | |
| parent | 593d2b096795664a4b1d43a998ff2ddb2f3de081 (diff) | |
| parent | 991d5c09d026ad580aef909dace2626ce858cbd8 (diff) | |
| download | build_soong-4c47d6013d14b50701d5a7e2b67b9f83cc7115c1.tar.gz build_soong-4c47d6013d14b50701d5a7e2b67b9f83cc7115c1.tar.bz2 build_soong-4c47d6013d14b50701d5a7e2b67b9f83cc7115c1.zip | |
Merge "Create sanitizer variants of APEX only when SANITIZE_TARGET is set" am: 62f6fcbbb9 am: f85699e747
am: 991d5c09d0
Change-Id: I11a5a3b9a0bf6e1991b0444f272f6afe38293b36
Diffstat (limited to 'cc')
| -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 90656da8..b95e2a8d 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -820,7 +820,7 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) { type Sanitizeable interface { android.Module - IsSanitizerEnabled() bool + IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizerName string) bool } // Create sanitized variants for modules that need them @@ -924,7 +924,7 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) { } } c.sanitize.Properties.SanitizeDep = false - } else if sanitizeable, ok := mctx.Module().(Sanitizeable); ok && sanitizeable.IsSanitizerEnabled() { + } else if sanitizeable, ok := mctx.Module().(Sanitizeable); ok && sanitizeable.IsSanitizerEnabled(mctx, t.String()) { // APEX modules fall here mctx.CreateVariations(t.String()) } |