From 84757ea7ea4607d36dc7413c3f82fbe1d5bc3b5d Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 23 Jan 2019 23:33:25 +0000 Subject: [PATCH] Revert "Fix: sanitizerRuntimeMutator is not run for host" This reverts commit 1c29b0e6ec3faf3b560335444c39f026cd212622. Reason for revert: Broke aosp_x86_64 Change-Id: I581200f1c271c3e1a39d5cdad84c782977b13054 --- cc/sanitize.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index 162e22e0b..d19e54a34 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -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