Use bootstrap linker for asan build am: a2aca28750

am: 03f7c2110c Change-Id: I8aff17397c03c11ffc8bf380e99a6f22e732b9b2
2019-02-03 07:41:18 -08:00
parent f69f7ccea0 03f7c2110c
commit 3e07ecd3ec
1 changed files with 5 additions and 1 deletions
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -444,7 +444,11 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
 			flags.LdFlags = append(flags.LdFlags, "-Wl,--no-as-needed")
 		} else {
 			flags.CFlags = append(flags.CFlags, "-mllvm", "-asan-globals=0")
-			flags.DynamicLinker = "/system/bin/linker_asan"
+			if ctx.bootstrap() {
+				flags.DynamicLinker = "/system/bin/bootstrap/linker_asan"
+			} else {
+				flags.DynamicLinker = "/system/bin/linker_asan"
+			}
 			if flags.Toolchain.Is64Bit() {
 				flags.DynamicLinker += "64"
 			}