StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export clang default settings.

Browse Source 
am: e748f5d912

Change-Id: Ie916a67b5989b46cd56e48185624d844beea631a
This commit is contained in:
Leo Li
2017-06-04 19:04:16 +00:00
committed by android-build-merger
parent b7f88de4bb e748f5d912
commit 3348b2d79c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cc/config/global.go
View File

@@ -21,9 +21,9 @@ import (
"android/soong/android" "android/soong/android"
) )
// Flags used by lots of devices. Putting them in package static variables will save bytes in
// build.ninja so they aren't repeated for every file
var ( var (
// Flags used by lots of devices. Putting them in package static variables
// will save bytes in build.ninja so they aren't repeated for every file
commonGlobalCflags = []string{ commonGlobalCflags = []string{
"-DANDROID", "-DANDROID",
"-fmessage-length=0", "-fmessage-length=0",
@@ -73,6 +73,11 @@ var (
ExperimentalCppStdVersion = "gnu++1z" ExperimentalCppStdVersion = "gnu++1z"
NdkMaxPrebuiltVersionInt = 24 NdkMaxPrebuiltVersionInt = 24
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-3859424"
ClangDefaultShortVersion = "4.0"
) )
var pctx = android.NewPackageContext("android/soong/cc/config") var pctx = android.NewPackageContext("android/soong/cc/config")
@@ -121,7 +126,7 @@ func init() {
pctx.PrefixedExistentPathsForSourcesVariable("CommonNativehelperInclude", "-I", pctx.PrefixedExistentPathsForSourcesVariable("CommonNativehelperInclude", "-I",
[]string{"libnativehelper/include/nativehelper"}) []string{"libnativehelper/include/nativehelper"})
pctx.SourcePathVariable("ClangDefaultBase", "prebuilts/clang/host") pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)
pctx.VariableFunc("ClangBase", func(config interface{}) (string, error) { pctx.VariableFunc("ClangBase", func(config interface{}) (string, error) {
if override := config.(android.Config).Getenv("LLVM_PREBUILTS_BASE"); override != "" { if override := config.(android.Config).Getenv("LLVM_PREBUILTS_BASE"); override != "" {
return override, nil return override, nil
@@ -132,7 +137,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-3859424", nil return ClangDefaultVersion, nil
}) })
pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}") pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}")
pctx.StaticVariable("ClangBin", "${ClangPath}/bin") pctx.StaticVariable("ClangBin", "${ClangPath}/bin")
@@ -141,7 +146,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 "4.0", nil return ClangDefaultShortVersion, nil
}) })
pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux") pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux")