tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Hide mutated variant in non-make builds." am: da11d7422f am: 062d42f4e9

Browse source 
am: 86fee971ea

Change-Id: If9a453c59ec3e994b0f1ba0ea795d1e308eec904
This commit is contained in:
Orion Hodson 2017-11-01 00:53:13 +00:00 committed by android-build-merger
commit 754deece71
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cc/sanitize.go
View file

@ -574,22 +574,22 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
modules[1].(*Module).sanitize.Properties.InSanitizerDir = true modules[1].(*Module).sanitize.Properties.InSanitizerDir = true
modules[1].(*Module).sanitize.SetSanitizer(cfi, false) modules[1].(*Module).sanitize.SetSanitizer(cfi, false)
} }
} } else {
if mctx.AConfig().EmbeddedInMake() && !mctx.Device() {
if isSanitizerEnabled {
modules[0].(*Module).Properties.HideFromMake = true
} else {
modules[1].(*Module).Properties.HideFromMake = true
}
}
if !mctx.AConfig().EmbeddedInMake() || !mctx.Device() {
if isSanitizerEnabled { if isSanitizerEnabled {
modules[0].(*Module).Properties.PreventInstall = true modules[0].(*Module).Properties.PreventInstall = true
} else { } else {
modules[1].(*Module).Properties.PreventInstall = true modules[1].(*Module).Properties.PreventInstall = true
} }
} }
if mctx.AConfig().EmbeddedInMake() {
if !mctx.Device() {
if isSanitizerEnabled {
modules[0].(*Module).Properties.HideFromMake = true
} else {
modules[1].(*Module).Properties.HideFromMake = true
}
}
}
} }
c.sanitize.Properties.SanitizeDep = false c.sanitize.Properties.SanitizeDep = false
} }