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

Support mixed ASAN and non-ASAN host builds

Browse Source 
Host builds may build binaries that must have ASAN disabled.  Convert
host ASAN to use variants.  Since there is only one install location for
shared libraries, don't install the non-ASAN variant at all for now.

Test: mmma -j art SANITIZE_HOST=address
Change-Id: Iacefecac93df44823316624b4c540c24f643fb80
This commit is contained in:
Colin Cross
2016-09-19 16:46:53 -07:00
parent f09c8437f9
commit b0f28957ae
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/cc.go
View File

@@ -120,6 +120,7 @@ type BaseProperties struct {
AndroidMkSharedLibs []string `blueprint:"mutated"` AndroidMkSharedLibs []string `blueprint:"mutated"`
HideFromMake bool `blueprint:"mutated"` HideFromMake bool `blueprint:"mutated"`
PreventInstall bool `blueprint:"mutated"`
} }
type UnusedProperties struct { type UnusedProperties struct {
@@ -423,7 +424,7 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
} }
c.outputFile = android.OptionalPathForPath(outputFile) c.outputFile = android.OptionalPathForPath(outputFile)
if c.installer != nil { if c.installer != nil && !c.Properties.PreventInstall {
c.installer.install(ctx, outputFile) c.installer.install(ctx, outputFile)
if ctx.Failed() { if ctx.Failed() {
return return

24
cc/sanitize.go
View File

@@ -354,20 +354,18 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
modules := mctx.CreateVariations(t.String()) modules := mctx.CreateVariations(t.String())
modules[0].(*Module).sanitize.SetSanitizer(t, true) modules[0].(*Module).sanitize.SetSanitizer(t, true)
} else if c.sanitize.Properties.SanitizeDep { } else if c.sanitize.Properties.SanitizeDep {
if c.Host() { modules := mctx.CreateVariations("", t.String())
modules := mctx.CreateVariations(t.String()) modules[0].(*Module).sanitize.SetSanitizer(t, false)
modules[0].(*Module).sanitize.SetSanitizer(t, true) modules[1].(*Module).sanitize.SetSanitizer(t, true)
modules[0].(*Module).sanitize.Properties.SanitizeDep = false modules[0].(*Module).sanitize.Properties.SanitizeDep = false
} else { modules[1].(*Module).sanitize.Properties.SanitizeDep = false
modules := mctx.CreateVariations("", t.String()) if mctx.Device() {
modules[0].(*Module).sanitize.SetSanitizer(t, false)
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 modules[1].(*Module).sanitize.Properties.InData = true
if mctx.AConfig().EmbeddedInMake() { } else {
modules[0].(*Module).Properties.HideFromMake = true modules[0].(*Module).Properties.PreventInstall = true
} }
if mctx.AConfig().EmbeddedInMake() {
modules[0].(*Module).Properties.HideFromMake = true
} }
} }
c.sanitize.Properties.SanitizeDep = false c.sanitize.Properties.SanitizeDep = false