diff options
| author | George Burgess IV <gbiv@google.com> | 2019-04-04 16:22:37 -0700 |
|---|---|---|
| committer | George Burgess IV <gbiv@google.com> | 2019-04-04 17:58:00 -0700 |
| commit | c4624c0189bd1cd27ac143373053f92c3b618ad3 (patch) | |
| tree | 7a254952e0be0ca3ece5a2dc46926da1e6155690 /cc | |
| parent | fc453c79f23103d694e9956bacc97bd41084f030 (diff) | |
| download | build_soong-c4624c0189bd1cd27ac143373053f92c3b618ad3.tar.gz build_soong-c4624c0189bd1cd27ac143373053f92c3b618ad3.tar.bz2 build_soong-c4624c0189bd1cd27ac143373053f92c3b618ad3.zip | |
Remove our clang-tidy wrapper
Looks like the reason for it existing has been fixed. It should probably
just be removed.
Bug: None
Test: WITH_TIDY=1 m
Change-Id: I770b2fec4ac44f265ff31731c9c0bd4da14d5b0f
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/builder.go | 4 | ||||
| -rw-r--r-- | cc/config/global.go | 1 | ||||
| -rw-r--r-- | cc/makevars.go | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/cc/builder.go b/cc/builder.go index c64243f6..e6435845 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -150,8 +150,8 @@ var ( clangTidy = pctx.AndroidStaticRule("clangTidy", blueprint.RuleParams{ - Command: "rm -f $out && CLANG_TIDY=${config.ClangBin}/clang-tidy ${config.ClangTidyShellPath} $tidyFlags $in -- $cFlags && touch $out", - CommandDeps: []string{"${config.ClangBin}/clang-tidy", "${config.ClangTidyShellPath}"}, + Command: "rm -f $out && ${config.ClangBin}/clang-tidy $tidyFlags $in -- $cFlags && touch $out", + CommandDeps: []string{"${config.ClangBin}/clang-tidy"}, }, "cFlags", "tidyFlags") diff --git a/cc/config/global.go b/cc/config/global.go index 372ffc47..78f24f2d 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -200,7 +200,6 @@ func init() { }) pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}") pctx.StaticVariable("ClangBin", "${ClangPath}/bin") - pctx.StaticVariable("ClangTidyShellPath", "build/soong/scripts/clang-tidy.sh") pctx.VariableFunc("ClangShortVersion", func(ctx android.PackageVarContext) string { if override := ctx.Config().Getenv("LLVM_RELEASE_VERSION"); override != "" { diff --git a/cc/makevars.go b/cc/makevars.go index aa6fdea5..dc91525a 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -75,7 +75,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("LLVM_OBJCOPY", "${config.ClangBin}/llvm-objcopy") ctx.Strict("LLVM_STRIP", "${config.ClangBin}/llvm-strip") 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.Strict("RS_LLVM_PREBUILTS_VERSION", "${config.RSClangVersion}") |