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

am: 9d12a12dc8

Change-Id: I156955624a31256eb34922b3484d33a26d08000b
This commit is contained in:
Dan Albert
2019-01-23 15:57:24 -08:00
committed by android-build-merger

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