Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40ecaea1 authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "Remove our clang-tidy wrapper" 

am: 6afe0168

Change-Id: I628822559916c1b36b326fa4ed9d614fae696c34
parents 069b3833 6afe0168

core/binary.mk

+4 −5
Original line number Diff line number Diff line
@@ -1535,11 +1535,10 @@ my_tidy_checks := $(subst $(space),,$(my_tidy_checks)) 


# 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

core/definitions.mk

+2 −3
Original line number Diff line number Diff line
@@ -1137,10 +1137,9 @@ define transform-cpp-to-o-compiler-args 
	$(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