Merge "Don't install both variants for host or non-make builds."

cc/sanitize.go

@@ -470,7 +470,6 @@ func (sanitize *sanitize) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMk
 			ret.SubName += ".asan"
 		}
 	}
-
 }
 
 func (sanitize *sanitize) inSanitizerDir() bool {
@@ -582,12 +581,6 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
 						modules[1].(*Module).sanitize.SetSanitizer(cfi, false)
 					}
 				} else {
-					if isSanitizerEnabled {
-						modules[0].(*Module).Properties.PreventInstall = true
-					} else {
-						modules[1].(*Module).Properties.PreventInstall = true
-					}
-
 					if mctx.AConfig().EmbeddedInMake() {
 						if isSanitizerEnabled {
 							modules[0].(*Module).Properties.HideFromMake = true
@@ -596,6 +589,13 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
 						}
 					}
 				}
+				if !mctx.AConfig().EmbeddedInMake() || !mctx.Device() {
+					if isSanitizerEnabled {
+						modules[0].(*Module).Properties.PreventInstall = true
+					} else {
+						modules[1].(*Module).Properties.PreventInstall = true
+					}
+				}
 			}
 			c.sanitize.Properties.SanitizeDep = false
 		}