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

Merge "Remove our clang-tidy wrapper" am: 6afe016825

Browse Source 
am: 40ecaea185

Change-Id: I0280a7365874e061cfb74407504c863f881db7d3
This commit is contained in:
George Burgess IV
2019-04-05 18:27:22 -07:00
committed by android-build-merger
parent a370936c6c 40ecaea185
commit 8999b6fd83
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/binary.mk
View File

@@ -1535,11 +1535,10 @@ my_tidy_checks := $(subst $(space),,$(my_tidy_checks))
# Add dependency of clang-tidy and clang-tidy.sh # Add dependency of clang-tidy and clang-tidy.sh
ifneq ($(my_tidy_checks),) ifneq ($(my_tidy_checks),)
my_clang_tidy_programs := $(PATH_TO_CLANG_TIDY) $(PATH_TO_CLANG_TIDY_SHELL) $(cpp_objects): $(intermediates)/%.o: $(PATH_TO_CLANG_TIDY)
$(cpp_objects): $(intermediates)/%.o: $(my_clang_tidy_programs) $(c_objects): $(intermediates)/%.o: $(PATH_TO_CLANG_TIDY)
$(c_objects): $(intermediates)/%.o: $(my_clang_tidy_programs) $(gen_cpp_objects): $(intermediates)/%.o: $(PATH_TO_CLANG_TIDY)
$(gen_cpp_objects): $(intermediates)/%.o: $(my_clang_tidy_programs) $(gen_c_objects): $(intermediates)/%.o: $(PATH_TO_CLANG_TIDY)
$(gen_c_objects): $(intermediates)/%.o: $(my_clang_tidy_programs)
endif endif
# Move -l* entries from ldflags to ldlibs, and everything else to ldflags # Move -l* entries from ldflags to ldlibs, and everything else to ldflags

5
core/definitions.mk
View File

@@ -1137,10 +1137,9 @@ define transform-cpp-to-o-compiler-args
$(PRIVATE_CPPFLAGS_NO_OVERRIDE) $(PRIVATE_CPPFLAGS_NO_OVERRIDE)
endef endef
# PATH_TO_CLANG_TIDY_SHELL is defined in build/soong # PATH_TO_CLANG_TIDY is defined in build/soong
define call-clang-tidy define call-clang-tidy
CLANG_TIDY=$(PATH_TO_CLANG_TIDY) \ $(PATH_TO_CLANG_TIDY) \
$(PATH_TO_CLANG_TIDY_SHELL) \
$(PRIVATE_TIDY_FLAGS) \ $(PRIVATE_TIDY_FLAGS) \
-checks=$(PRIVATE_TIDY_CHECKS) -checks=$(PRIVATE_TIDY_CHECKS)
endef endef