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

Switch PackageContext functions to take a ctx am: 54daaf0371

Browse Source 
am: f34acc112e

Change-Id: I11d13250bbe1b40179b764799ca607b2bacc607b
This commit is contained in:
Dan Willemsen
2018-03-14 00:33:31 +00:00
committed by android-build-merger
parent 04f97ce059 f34acc112e
commit 74edf2fdbe
7 changed files with 144 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cc/config/global.go
View File

@@ -180,26 +180,26 @@ func init() {
[]string{"libnativehelper/include_jni"})
pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)
pctx.VariableFunc("ClangBase", func(config android.Config) (string, error) {
if override := config.Getenv("LLVM_PREBUILTS_BASE"); override != "" {
return override, nil
pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv("LLVM_PREBUILTS_BASE"); override != "" {
return override
}
return "${ClangDefaultBase}", nil
return "${ClangDefaultBase}"
})
pctx.VariableFunc("ClangVersion", func(config android.Config) (string, error) {
if override := config.Getenv("LLVM_PREBUILTS_VERSION"); override != "" {
return override, nil
pctx.VariableFunc("ClangVersion", func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv("LLVM_PREBUILTS_VERSION"); override != "" {
return override
}
return ClangDefaultVersion, nil
return ClangDefaultVersion
})
pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}")
pctx.StaticVariable("ClangBin", "${ClangPath}/bin")
pctx.VariableFunc("ClangShortVersion", func(config android.Config) (string, error) {
if override := config.Getenv("LLVM_RELEASE_VERSION"); override != "" {
return override, nil
pctx.VariableFunc("ClangShortVersion", func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv("LLVM_RELEASE_VERSION"); override != "" {
return override
}
return ClangDefaultShortVersion, nil
return ClangDefaultShortVersion
})
pctx.StaticVariable("ClangAsanLibDir", "${ClangBase}/linux-x86/${ClangVersion}/lib64/clang/${ClangShortVersion}/lib/linux")
if runtime.GOOS == "darwin" {
@@ -222,11 +222,11 @@ func init() {
"frameworks/rs/script_api/include",
})
pctx.VariableFunc("CcWrapper", func(config android.Config) (string, error) {
if override := config.Getenv("CC_WRAPPER"); override != "" {
return override + " ", nil
pctx.VariableFunc("CcWrapper", func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv("CC_WRAPPER"); override != "" {
return override + " "
}
return "", nil
return ""
})
}