Merge "Disable clang-analyzer-* checks." am: 041245bc01
am: ea59036ec8

Change-Id: I1560812a1410e9e62d14d538400c37bd4c4cab9f
diff --git a/Android.mk b/Android.mk
index 2d3c1ff..4c5e09e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,10 @@
 LOCAL_PATH:= $(call my-dir)
 
+# b/31559947, Some files caused clang-analyzer-* checks to segmentation fault.
+common_local_tidy_checks := -clang-analyzer-*
 include $(CLEAR_VARS)
 
+LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
 LOCAL_MODULE := libcxcore
 LOCAL_MODULE_TAGS := optional
 
@@ -66,6 +69,8 @@
        -Wno-sign-compare \
        -Wno-parentheses-equality
 
+LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
+
 LOCAL_SRC_FILES := \
         cv/src/cvaccum.cpp \
         cv/src/cvadapthresh.cpp \
@@ -138,6 +143,7 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
 LOCAL_MODULE    := libcvaux
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := \
@@ -208,6 +214,7 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
 LOCAL_MODULE    := libcvml
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := \
@@ -241,6 +248,7 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
 LOCAL_MODULE    := libcvhighgui
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := \
@@ -282,6 +290,7 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
 LOCAL_MODULE    := libopencv
 LOCAL_MODULE_TAGS := optional