diff options
-rw-r--r-- | cc/sanitize.go | 5 | ||||
-rw-r--r-- | ui/build/cleanbuild.go | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go index ee549bc0..23a7be44 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -300,10 +300,12 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps { } func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { - minimalRuntimePath := "${config.ClangAsanLibDir}/" + config.UndefinedBehaviorSanitizerMinimalRuntimeLibrary(ctx.toolchain()) + ".a" + minimalRuntimeLib := config.UndefinedBehaviorSanitizerMinimalRuntimeLibrary(ctx.toolchain()) + ".a" + minimalRuntimePath := "${config.ClangAsanLibDir}/" + minimalRuntimeLib if ctx.Device() && sanitize.Properties.MinimalRuntimeDep { flags.LdFlags = append(flags.LdFlags, minimalRuntimePath) + flags.LdFlags = append(flags.LdFlags, "-Wl,--exclude-libs,"+minimalRuntimeLib) } if !sanitize.Properties.SanitizerEnabled { return flags @@ -449,6 +451,7 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { if enableMinimalRuntime(sanitize) { flags.CFlags = append(flags.CFlags, strings.Join(minimalRuntimeFlags, " ")) flags.libFlags = append([]string{minimalRuntimePath}, flags.libFlags...) + flags.LdFlags = append(flags.LdFlags, "-Wl,--exclude-libs,"+minimalRuntimeLib) } } } diff --git a/ui/build/cleanbuild.go b/ui/build/cleanbuild.go index f2de2cda..24a8c7a8 100644 --- a/ui/build/cleanbuild.go +++ b/ui/build/cleanbuild.go @@ -107,6 +107,7 @@ func installClean(ctx Context, config Config, what int) { productOut("system"), productOut("system_other"), productOut("vendor"), + productOut("product"), productOut("oem"), productOut("obj/FAKE"), productOut("breakpad"), |