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

View File

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