Merge "Call clang-tidy with -quiet unless WITH_TIDY is set." am: 305d2abb27

am: c1ddbf65be

Change-Id: I3bd0584158e60f67f7dcab5b9f6e02b54428811a
This commit is contained in:
Chih-Hung Hsieh 2017-12-16 01:59:20 +00:00 committed by android-build-merger
commit 322f7fd374
1 changed files with 5 additions and 6 deletions

View File

@ -1714,16 +1714,15 @@ ifneq (,$(filter 1 true,$(my_tidy_enabled)))
ifneq ($(LOCAL_TIDY_CHECKS),) ifneq ($(LOCAL_TIDY_CHECKS),)
my_tidy_checks := $(my_tidy_checks),$(LOCAL_TIDY_CHECKS) my_tidy_checks := $(my_tidy_checks),$(LOCAL_TIDY_CHECKS)
endif endif
# Set up global default clang-tidy flags, which is none. my_tidy_flags += $(WITH_TIDY_FLAGS) $(LOCAL_TIDY_FLAGS)
my_tidy_flags := $(WITH_TIDY_FLAGS)
# Use local clang-tidy flags if specified.
ifneq ($(LOCAL_TIDY_FLAGS),)
my_tidy_flags := $(LOCAL_TIDY_FLAGS)
endif
# If tidy flags are not specified, default to check all header files. # If tidy flags are not specified, default to check all header files.
ifeq ($(my_tidy_flags),) ifeq ($(my_tidy_flags),)
my_tidy_flags := $(call default_tidy_header_filter,$(LOCAL_PATH)) my_tidy_flags := $(call default_tidy_header_filter,$(LOCAL_PATH))
endif endif
# If clang-tidy is not enabled globally, add the -quiet flag.
ifeq (,$(filter 1 true,$(WITH_TIDY)))
my_tidy_flags += -quiet
endif
# We might be using the static analyzer through clang-tidy. # We might be using the static analyzer through clang-tidy.
# https://bugs.llvm.org/show_bug.cgi?id=32914 # https://bugs.llvm.org/show_bug.cgi?id=32914