Merge "Revert "Fix: sanitizerRuntimeMutator is not run for host""

This commit is contained in:
Dan Albert 2019-01-23 23:37:37 +00:00 committed by Gerrit Code Review
commit 9f100ca0e3
1 changed files with 3 additions and 3 deletions

View File

@ -667,10 +667,10 @@ func sanitizerRuntimeDepsMutator(mctx android.TopDownMutatorContext) {
// Add the dependency to the runtime library for each of the sanitizer variants
func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
if mctx.Os() != android.Android {
return
}
if c, ok := mctx.Module().(*Module); ok && c.sanitize != nil {
if !c.Enabled() {
return
}
var sanitizers []string
var diagSanitizers []string