commit 305d2abb275f7f5d32fafb5807dc5af616219aa0
author Treehugger Robot <treehugger-gerrit@google.com> Sat Dec 16 01:53:44 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 16 01:53:44 2017 +0000
tree 247745f1d422c85a76d5656643aadaaf26ff61df
parent 9d3270bd52615b3a8ae529e8ac2789e0be40aecc
parent 6375b6d7306e4804c31cab05e63ac28e17ef2e36

Merge "Call clang-tidy with -quiet unless WITH_TIDY is set."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 9145d26..cc6df60 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1714,16 +1714,15 @@
     ifneq ($(LOCAL_TIDY_CHECKS),)
       my_tidy_checks := $(my_tidy_checks),$(LOCAL_TIDY_CHECKS)
     endif
-    # Set up global default clang-tidy flags, which is none.
-    my_tidy_flags := $(WITH_TIDY_FLAGS)
-    # Use local clang-tidy flags if specified.
-    ifneq ($(LOCAL_TIDY_FLAGS),)
-      my_tidy_flags := $(LOCAL_TIDY_FLAGS)
-    endif
+    my_tidy_flags += $(WITH_TIDY_FLAGS) $(LOCAL_TIDY_FLAGS)
     # If tidy flags are not specified, default to check all header files.
     ifeq ($(my_tidy_flags),)
       my_tidy_flags := $(call default_tidy_header_filter,$(LOCAL_PATH))
     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.
     # https://bugs.llvm.org/show_bug.cgi?id=32914