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

Merge "Define PATH_TO_CLANG_TIDY_SHELL for build/make rules."

Browse Source
This commit is contained in:
Chih-hung Hsieh
2018-08-28 18:18:32 +00:00
committed by Gerrit Code Review
parent 573864c015 b699c43f89
commit 4b42edbca0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/builder.go
View File

@@ -150,12 +150,10 @@ var (
}, },
"crossCompile") "crossCompile")
_ = pctx.SourcePathVariable("tidyPath", "build/soong/scripts/clang-tidy.sh")
clangTidy = pctx.AndroidStaticRule("clangTidy", clangTidy = pctx.AndroidStaticRule("clangTidy",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "rm -f $out && CLANG_TIDY=${config.ClangBin}/clang-tidy $tidyPath $tidyFlags $in -- $cFlags && touch $out", Command: "rm -f $out && CLANG_TIDY=${config.ClangBin}/clang-tidy ${config.ClangTidyShellPath} $tidyFlags $in -- $cFlags && touch $out",
CommandDeps: []string{"${config.ClangBin}/clang-tidy", "$tidyPath"}, CommandDeps: []string{"${config.ClangBin}/clang-tidy", "${config.ClangTidyShellPath}"},
}, },
"cFlags", "tidyFlags") "cFlags", "tidyFlags")

1
cc/config/global.go
View File

@@ -209,6 +209,7 @@ func init() {
}) })
pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}") pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}")
pctx.StaticVariable("ClangBin", "${ClangPath}/bin") pctx.StaticVariable("ClangBin", "${ClangPath}/bin")
pctx.StaticVariable("ClangTidyShellPath", "build/soong/scripts/clang-tidy.sh")
pctx.VariableFunc("ClangShortVersion", func(ctx android.PackageVarContext) string { pctx.VariableFunc("ClangShortVersion", func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv("LLVM_RELEASE_VERSION"); override != "" { if override := ctx.Config().Getenv("LLVM_RELEASE_VERSION"); override != "" {

1
cc/makevars.go
View File

@@ -75,6 +75,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("LLVM_OBJCOPY", "${config.ClangBin}/llvm-objcopy") ctx.Strict("LLVM_OBJCOPY", "${config.ClangBin}/llvm-objcopy")
ctx.Strict("LLVM_STRIP", "${config.ClangBin}/llvm-strip") ctx.Strict("LLVM_STRIP", "${config.ClangBin}/llvm-strip")
ctx.Strict("PATH_TO_CLANG_TIDY", "${config.ClangBin}/clang-tidy") ctx.Strict("PATH_TO_CLANG_TIDY", "${config.ClangBin}/clang-tidy")
ctx.Strict("PATH_TO_CLANG_TIDY_SHELL", "${config.ClangTidyShellPath}")
ctx.StrictSorted("CLANG_CONFIG_UNKNOWN_CFLAGS", strings.Join(config.ClangUnknownCflags, " ")) ctx.StrictSorted("CLANG_CONFIG_UNKNOWN_CFLAGS", strings.Join(config.ClangUnknownCflags, " "))
ctx.Strict("RS_LLVM_PREBUILTS_VERSION", "${config.RSClangVersion}") ctx.Strict("RS_LLVM_PREBUILTS_VERSION", "${config.RSClangVersion}")