tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Switch to clang-3688880."

Browse source
This commit is contained in:
Stephen Hines 2017-02-01 21:25:01 +00:00 committed by Gerrit Code Review
commit e25bc9ba83
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 != "" { if override := config.(android.Config).Getenv("LLVM_PREBUILTS_VERSION"); override != "" {
return override, nil return override, nil
} }
return "clang-3289846", nil return "clang-3688880", nil
}) })
pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}") pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}")
pctx.StaticVariable("ClangBin", "${ClangPath}/bin") pctx.StaticVariable("ClangBin", "${ClangPath}/bin")
@ -139,7 +139,7 @@ func init() {
if override := config.(android.Config).Getenv("LLVM_RELEASE_VERSION"); override != "" { if override := config.(android.Config).Getenv("LLVM_RELEASE_VERSION"); override != "" {
return override, nil return override, nil
} }
return "3.8", nil return "4.0", nil
}) })
pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux") pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux")