openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Switch to clang-3688880." am: e25bc9ba83 

am: 09668fc4a3

Change-Id: Id80fac9db0316f340686d5b31075fe4c75e08b8a
This commit is contained in:
Stephen Hines 2017-02-01 21:32:23 +00:00 committed by android-build-merger
parent 649d6f30cd 09668fc4a3
commit e410bf1e4d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cc/config/global.go
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-3688880", 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")