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

Merge "Fix coverage sanitizer builds"

Browse Source 
am: 9883461664

Change-Id: I2b5ab662ff95c5e18827750fde9bd8f72d24777e
This commit is contained in:
Colin Cross
2016-08-15 18:24:40 +00:00
committed by android-build-merger
parent 7d7245f3fe 9883461664
commit d6bf916a03
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/sanitize.go
View File

@@ -140,6 +140,7 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
if ctx.staticBinary() { if ctx.staticBinary() {
s.Address = nil s.Address = nil
s.Coverage = nil
s.Thread = nil s.Thread = nil
} }
@@ -317,6 +318,9 @@ func (sanitize *sanitize) SetSanitizer(t sanitizerType, b bool) {
switch t { switch t {
case asan: case asan:
sanitize.Properties.Sanitize.Address = boolPtr(b) sanitize.Properties.Sanitize.Address = boolPtr(b)
if !b {
sanitize.Properties.Sanitize.Coverage = nil
}
case tsan: case tsan:
sanitize.Properties.Sanitize.Thread = boolPtr(b) sanitize.Properties.Sanitize.Thread = boolPtr(b)
default: default: