commit 11a27f61e331f26dc3bd070c3310d09a123db257
author Stephen Hines <srhines@google.com> Thu Jan 25 14:55:03 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 25 14:55:03 2018 +0000
tree 3d9cc3dfc912f8bb0f5e1cfe12bd248bd497ce5f
parent 2b6236308b0ea64af94a1dd9efa1f8fb41168c63
parent 755fe072568ec18d563b7e54bc5e2a5bd90d3854

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

Change-Id: If34b470432858ede8af06dc2d1a6fe970fa16346

cc/config/global.go

diff --git a/cc/config/global.go b/cc/config/global.go
index 5e99cde..3784824 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 {