Merge "Switch to clang-3625443." am: 49110a5d88

am: 0e3a363ef6

Change-Id: I27327e7ac3413f0ffa18dcc05d3ee60583aa7249
This commit is contained in:
Stephen Hines
2017-01-26 07:25:07 +00:00
committed by android-build-merger

View File

@@ -130,7 +130,7 @@ func init() {
if override := config.(android.Config).Getenv("LLVM_PREBUILTS_VERSION"); override != "" {
return override, nil
}
return "clang-3289846", nil
return "clang-3625443", nil
})
pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}")
pctx.StaticVariable("ClangBin", "${ClangPath}/bin")
@@ -139,7 +139,7 @@ func init() {
if override := config.(android.Config).Getenv("LLVM_RELEASE_VERSION"); override != "" {
return override, nil
}
return "3.8", nil
return "4.0", nil
})
pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux")