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

Fix sanitize host builds am: b36ab1a1a0

Browse Source 
am: ef6073265b

* commit 'ef6073265bb5fb164eaf5cc981db7b2dd915dfae':
  Fix sanitize host builds

Change-Id: I3faf7520a77c31c30b30c454d9586c36781849f9
This commit is contained in:
Colin Cross
2016-05-25 19:50:06 +00:00
committed by android-build-merger
parent 390f076154 ef6073265b
commit 0f8af7b05f
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cc/sanitize.go
View File

@@ -331,18 +331,24 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
if d, ok := c.linker.(baseLinkerInterface); ok && d.isDependencyRoot() && c.sanitize.Sanitizer(t) { if d, ok := c.linker.(baseLinkerInterface); ok && d.isDependencyRoot() && c.sanitize.Sanitizer(t) {
modules := mctx.CreateVariations(t.String()) modules := mctx.CreateVariations(t.String())
modules[0].(*Module).sanitize.SetSanitizer(t, true) modules[0].(*Module).sanitize.SetSanitizer(t, true)
if mctx.AConfig().EmbeddedInMake() { if mctx.AConfig().EmbeddedInMake() && !c.Host() {
modules[0].(*Module).sanitize.Properties.InData = true modules[0].(*Module).sanitize.Properties.InData = true
} }
} else if c.sanitize.Properties.SanitizeDep { } else if c.sanitize.Properties.SanitizeDep {
modules := mctx.CreateVariations("", t.String()) if c.Host() {
modules[0].(*Module).sanitize.SetSanitizer(t, false) modules := mctx.CreateVariations(t.String())
modules[1].(*Module).sanitize.SetSanitizer(t, true) modules[0].(*Module).sanitize.SetSanitizer(t, true)
modules[0].(*Module).sanitize.Properties.SanitizeDep = false modules[0].(*Module).sanitize.Properties.SanitizeDep = false
modules[1].(*Module).sanitize.Properties.SanitizeDep = false } else {
modules[1].(*Module).sanitize.Properties.InData = true modules := mctx.CreateVariations("", t.String())
if mctx.AConfig().EmbeddedInMake() { modules[0].(*Module).sanitize.SetSanitizer(t, false)
modules[0].(*Module).Properties.HideFromMake = true 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.InData = true
if mctx.AConfig().EmbeddedInMake() {
modules[0].(*Module).Properties.HideFromMake = true
}
} }
} }
c.sanitize.Properties.SanitizeDep = false c.sanitize.Properties.SanitizeDep = false