Revert "Don't apply sanitizer mutators to host modules."
This reverts commit bba1927bdeccc3ffebab47ee063c53cf89a23de2.
Change-Id: Ie895d8eae5abb533468b836639e0835e7adbf8c9
diff --git a/cc/sanitize.go b/cc/sanitize.go
index c585f6a..e2bb009 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -527,7 +527,7 @@
// Create asan variants for modules that need them
func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
return func(mctx android.BottomUpMutatorContext) {
- if c, ok := mctx.Module().(*Module); ok && c.sanitize != nil && !c.Host() {
+ if c, ok := mctx.Module().(*Module); ok && c.sanitize != nil {
if c.isDependencyRoot() && c.sanitize.isSanitizerExplicitlyEnabled(t) {
modules := mctx.CreateVariations(t.String())
modules[0].(*Module).sanitize.SetSanitizer(t, true)
@@ -537,8 +537,15 @@
modules[1].(*Module).sanitize.SetSanitizer(t, true)
modules[0].(*Module).sanitize.Properties.SanitizeDep = false
modules[1].(*Module).sanitize.Properties.SanitizeDep = false
- modules[1].(*Module).sanitize.Properties.InSanitizerDir = true
-
+ if mctx.Device() {
+ modules[1].(*Module).sanitize.Properties.InSanitizerDir = true
+ } else {
+ if c.sanitize.isSanitizerExplicitlyEnabled(t) {
+ modules[0].(*Module).Properties.PreventInstall = true
+ } else {
+ modules[1].(*Module).Properties.PreventInstall = true
+ }
+ }
if mctx.AConfig().EmbeddedInMake() {
if c.sanitize.isSanitizerExplicitlyEnabled(t) {
modules[0].(*Module).Properties.HideFromMake = true