StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't apply sanitizer mutators to host modules."

Browse Source 
This reverts commit bba1927bde.

Change-Id: Ie895d8eae5abb533468b836639e0835e7adbf8c9
This commit is contained in:
Vishwath Mohan
2017-08-11 00:52:44 +00:00
parent bba1927bde
commit e615345f28
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cc/sanitize.go
View File

@@ -527,7 +527,7 @@ func sanitizerDepsMutator(t sanitizerType) func(android.TopDownMutatorContext) {
// 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 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
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