Merge "Fix UBSanitized host binaries missing runtime." into rvc-dev

This commit is contained in:
Ivan Lozano 2020-03-13 15:52:47 +00:00 committed by Android (Google) Code Review
commit 0ad6ef5d9b
1 changed files with 5 additions and 0 deletions

View File

@ -900,6 +900,11 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
c.sanitize.Properties.Sanitizers = sanitizers
c.sanitize.Properties.DiagSanitizers = diagSanitizers
// TODO(b/150822854) Hosts have a different default behavior and assume the runtime library is used.
if c.Host() {
diagSanitizers = sanitizers
}
// Determine the runtime library required
runtimeLibrary := ""
var extraStaticDeps []string