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: Ic001393da7211cd6ef2bbd5af6ef13c7fe8e00e7
diff --git a/core/binary.mk b/core/binary.mk
index da188ae..f3a50f1 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1538,11 +1538,10 @@
# Add dependency of clang-tidy and clang-tidy.sh
ifneq ($(my_tidy_checks),)
- my_clang_tidy_programs := $(PATH_TO_CLANG_TIDY) $(PATH_TO_CLANG_TIDY_SHELL)
- $(cpp_objects): $(intermediates)/%.o: $(my_clang_tidy_programs)
- $(c_objects): $(intermediates)/%.o: $(my_clang_tidy_programs)
- $(gen_cpp_objects): $(intermediates)/%.o: $(my_clang_tidy_programs)
- $(gen_c_objects): $(intermediates)/%.o: $(my_clang_tidy_programs)
+ $(cpp_objects): $(intermediates)/%.o: $(PATH_TO_CLANG_TIDY)
+ $(c_objects): $(intermediates)/%.o: $(PATH_TO_CLANG_TIDY)
+ $(gen_cpp_objects): $(intermediates)/%.o: $(PATH_TO_CLANG_TIDY)
+ $(gen_c_objects): $(intermediates)/%.o: $(PATH_TO_CLANG_TIDY)
endif
# Move -l* entries from ldflags to ldlibs, and everything else to ldflags
diff --git a/core/definitions.mk b/core/definitions.mk
index 02b737c..bc9a679 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1137,10 +1137,9 @@
$(PRIVATE_CPPFLAGS_NO_OVERRIDE)
endef
-# PATH_TO_CLANG_TIDY_SHELL is defined in build/soong
+# PATH_TO_CLANG_TIDY is defined in build/soong
define call-clang-tidy
-CLANG_TIDY=$(PATH_TO_CLANG_TIDY) \
- $(PATH_TO_CLANG_TIDY_SHELL) \
+$(PATH_TO_CLANG_TIDY) \
$(PRIVATE_TIDY_FLAGS) \
-checks=$(PRIVATE_TIDY_CHECKS)
endef