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

Merge "Fix UBSanitized host binaries missing runtime." am: ea0006fcc0

Browse Source 
Change-Id: I83822e15ce0478a573271ceaca60ad8bd33299a8
This commit is contained in:
Automerger Merge Worker
2020-03-12 17:55:12 +00:00
parent c6b4caf37e ea0006fcc0
commit bc39a18785
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/sanitize.go
View File

@@ -900,6 +900,11 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
c.sanitize.Properties.Sanitizers = sanitizers c.sanitize.Properties.Sanitizers = sanitizers
c.sanitize.Properties.DiagSanitizers = diagSanitizers 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 // Determine the runtime library required
runtimeLibrary := "" runtimeLibrary := ""
var extraStaticDeps []string var extraStaticDeps []string