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

Merge "Don't install both variants for host or non-make builds."

Browse Source 
am: 845da14a35

Change-Id: I63bf076b1e9cd2c071aac819bc2a6ed400db1365
This commit is contained in:
Vishwath Mohan
2017-11-02 17:45:33 +00:00
committed by android-build-merger
parent 4845af3d41 845da14a35
commit 511ff4330f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cc/sanitize.go
View File

@@ -470,7 +470,6 @@ func (sanitize *sanitize) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMk
ret.SubName += ".asan" ret.SubName += ".asan"
} }
} }
} }
func (sanitize *sanitize) inSanitizerDir() bool { func (sanitize *sanitize) inSanitizerDir() bool {
@@ -582,12 +581,6 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
modules[1].(*Module).sanitize.SetSanitizer(cfi, false) modules[1].(*Module).sanitize.SetSanitizer(cfi, false)
} }
} else { } else {
if isSanitizerEnabled {
modules[0].(*Module).Properties.PreventInstall = true
} else {
modules[1].(*Module).Properties.PreventInstall = true
}
if mctx.AConfig().EmbeddedInMake() { if mctx.AConfig().EmbeddedInMake() {
if isSanitizerEnabled { if isSanitizerEnabled {
modules[0].(*Module).Properties.HideFromMake = true modules[0].(*Module).Properties.HideFromMake = true
@@ -596,6 +589,13 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
} }
} }
} }
if !mctx.AConfig().EmbeddedInMake() || !mctx.Device() {
if isSanitizerEnabled {
modules[0].(*Module).Properties.PreventInstall = true
} else {
modules[1].(*Module).Properties.PreventInstall = true
}
}
} }
c.sanitize.Properties.SanitizeDep = false c.sanitize.Properties.SanitizeDep = false
} }