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

Merge "rust: Only apply hwasan flags once to fuzz targets" am: 602227bcb5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1891695

Change-Id: Ib2f920502e7e80f3b1a98975e9336c655333e94b
This commit is contained in:
Ivan Lozano
2021-11-15 16:16:07 +00:00
committed by Automerger Merge Worker
parent b75047f16f 602227bcb5
commit 42f8b77142
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rust/sanitize.go
View File

@@ -237,12 +237,10 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags, deps PathDeps) (
} else {
flags.RustFlags = append(flags.RustFlags, asanFlags...)
}
}
if Bool(sanitize.Properties.Sanitize.Address) {
flags.RustFlags = append(flags.RustFlags, asanFlags...)
}
if Bool(sanitize.Properties.Sanitize.Hwaddress) {
} else if Bool(sanitize.Properties.Sanitize.Hwaddress) {
flags.RustFlags = append(flags.RustFlags, hwasanFlags...)
} else if Bool(sanitize.Properties.Sanitize.Address) {
flags.RustFlags = append(flags.RustFlags, asanFlags...)
}
return flags, deps
}