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

Merge "Fix installation path for asan libraries"

Browse Source
This commit is contained in:
Treehugger Robot
2016-08-29 22:29:15 +00:00
committed by Gerrit Code Review
parent 70595d1e95 9461040154
commit 27807b5415
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/cc.go
View File

@@ -873,6 +873,9 @@ func (c *Module) InstallInData() bool {
if c.installer == nil { if c.installer == nil {
return false return false
} }
if c.sanitize != nil && c.sanitize.inData() {
return true
}
return c.installer.inData() return c.installer.inData()
} }

3
cc/sanitize.go
View File

@@ -353,9 +353,6 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
if c.isDependencyRoot() && c.sanitize.Sanitizer(t) { if c.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() && !c.Host() {
modules[0].(*Module).sanitize.Properties.InData = true
}
} else if c.sanitize.Properties.SanitizeDep { } else if c.sanitize.Properties.SanitizeDep {
if c.Host() { if c.Host() {
modules := mctx.CreateVariations(t.String()) modules := mctx.CreateVariations(t.String())