Merge "Revert "Re-enable ASAN globals instrumentation for devices."" am: 20cf012ad1
am: 5006a72ec9
Change-Id: Ideb2d45574765cfe30af0bf2b6c51833b872c729
This commit is contained in:
@@ -451,6 +451,7 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
|
|||||||
// libraries needed with -fsanitize=address. http://b/18650275 (WAI)
|
// libraries needed with -fsanitize=address. http://b/18650275 (WAI)
|
||||||
flags.LdFlags = append(flags.LdFlags, "-Wl,--no-as-needed")
|
flags.LdFlags = append(flags.LdFlags, "-Wl,--no-as-needed")
|
||||||
} else {
|
} else {
|
||||||
|
flags.CFlags = append(flags.CFlags, "-mllvm", "-asan-globals=0")
|
||||||
if ctx.bootstrap() {
|
if ctx.bootstrap() {
|
||||||
flags.DynamicLinker = "/system/bin/bootstrap/linker_asan"
|
flags.DynamicLinker = "/system/bin/bootstrap/linker_asan"
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user