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

Merge "Remove our clang-tidy wrapper"

Browse Source
This commit is contained in:
Treehugger Robot
2019-04-05 21:58:36 +00:00
committed by Gerrit Code Review
parent 56405f8071 c4624c0189
commit 45a5a287af
4 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/builder.go
View File

@@ -150,8 +150,8 @@ var (
clangTidy = pctx.AndroidStaticRule("clangTidy", clangTidy = pctx.AndroidStaticRule("clangTidy",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "rm -f $out && CLANG_TIDY=${config.ClangBin}/clang-tidy ${config.ClangTidyShellPath} $tidyFlags $in -- $cFlags && touch $out", Command: "rm -f $out && ${config.ClangBin}/clang-tidy $tidyFlags $in -- $cFlags && touch $out",
CommandDeps: []string{"${config.ClangBin}/clang-tidy", "${config.ClangTidyShellPath}"}, CommandDeps: []string{"${config.ClangBin}/clang-tidy"},
}, },
"cFlags", "tidyFlags") "cFlags", "tidyFlags")

1
cc/config/global.go
View File

@@ -200,7 +200,6 @@ 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,7 +75,6 @@ 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}")

37
scripts/clang-tidy.sh
View File

@@ -1,37 +0,0 @@
#!/bin/bash -e
# Copyright 2018 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Wrapper script to remove clang compiler flags rejected by clang-tidy.
# Inputs:
# Environment:
# CLANG_TIDY: path to the real clang-tidy program
# clang-tidy doesn't recognize every flag that clang compiler does.
# It gives clang-diagnostic-unused-command-line-argument warnings
# to -Wa,* flags.
# The -flto flags caused clang-tidy to ignore the -I flags,
# see https://bugs.llvm.org/show_bug.cgi?id=38332.
# -fsanitize and -fwhole-program-vtables need -flto.
args=("${@}")
n=${#args[@]}
for ((i=0; i<$n; ++i)); do
case ${args[i]} in
-Wa,*|-flto|-flto=*|-fsanitize=*|-fsanitize-*|-fwhole-program-vtables)
unset args[i]
;;
esac
done
${CLANG_TIDY} "${args[@]}"