Merge "Revert "Switch to clang-3625443."" am: 7f205c8289

am: 0466bfff63

Change-Id: Idb13f892320338a963956430f02fdbe3812b1da2
This commit is contained in:
Brian Carlstrom
2017-01-26 08:13:13 +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-3625443", nil
return "clang-3289846", 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 "4.0", nil
return "3.8", nil
})
pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux")