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

am: d2fffefd91

Change-Id: I574ad75f8dc39c4d4652a9ed80efb62fc280687b
This commit is contained in:
Pirama Arumuga Nainar
2019-01-24 21:13:54 -08:00
committed by android-build-merger

View File

@@ -672,10 +672,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 {
if c, ok := mctx.Module().(*Module); ok && c.sanitize != nil {
if !c.Enabled() {
return
}
if c, ok := mctx.Module().(*Module); ok && c.sanitize != nil {
var sanitizers []string
var diagSanitizers []string