commit 828484cc9593432f38f661cfe38f06e07c75190f
author Stephen Hines <srhines@google.com> Thu Jan 25 15:00:05 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 25 15:00:05 2018 +0000
tree 14ce0934cf9fb29f9a08539c181f6735e94d3c51
parent e3e265939f750a4f059e4d4b3addb46294038a4c
parent af0d71c83b27f5a30e3b768d2d74f3dd9d20a343

Prebuilt sanitizer libraries should always come from linux-x86. am: 755fe07256 am: 11a27f61e3
am: af0d71c83b

Change-Id: I462fc0542755c59b542c921dee3194dc8b048045

cc/config/global.go

diff --git a/cc/config/global.go b/cc/config/global.go
index eadb65d..0934efa 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -201,7 +201,7 @@
 		}
 		return ClangDefaultShortVersion, nil
 	})
-	pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux")
+	pctx.StaticVariable("ClangAsanLibDir", "${ClangBase}/linux-x86/${ClangVersion}/lib64/clang/${ClangShortVersion}/lib/linux")
 	if runtime.GOOS == "darwin" {
 		pctx.StaticVariable("LLVMGoldPlugin", "${ClangPath}/lib64/LLVMgold.dylib")
 	} else {