commit 3a38bf195d6a6775cb30c9baa89bb0b4f3bdf335
author George Burgess IV <gbiv@google.com> Wed May 10 05:04:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 10 05:04:00 2017 +0000
tree a83fbfb45064a60347c35e2bc23bd494b3de63b8
parent 1683aea819c6707f4fbfe27ddc6bc5b0b29097e3
parent 37f6f8181f64bace3f7469bc71472c246baa8e46

Merge "make: add __clang_analyzer__ to clang-tidy" am: 57273013cf am: c352502062 am: 9b802e745d
am: 37f6f8181f

Change-Id: I33fc7d6534849aef51c6ea37510b8cc4295ed2c9

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 76ba82b..625d348 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1684,6 +1684,12 @@
     ifeq ($(my_tidy_flags),)
       my_tidy_flags := $(call default_tidy_header_filter,$(LOCAL_PATH))
     endif
+
+    # We might be using the static analyzer through clang-tidy.
+    # https://bugs.llvm.org/show_bug.cgi?id=32914
+    ifneq ($(my_tidy_checks),)
+      my_tidy_flags += "-extra-arg-before=-D__clang_analyzer__"
+    endif
   endif
 endif