From fca7aac5ecd995085b71a4d90b4862f68fbaeb45 Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Thu, 26 Jan 2017 18:47:14 -0800
Subject: [PATCH] Work around clang-tidy segmentation fault.

This should affect only builds that call clang-tidy.
Without this change, clang-tidy has segmentation fault
when compiling several files in the incident_* directories.

Bug: 34740546
Test: build with WITH_TIDY=1 and
DEFAULT_GLOBAL_TIDY_CHECKS="*,-readability-*,-google-readability-*,-google-runtime-references"

Change-Id: Idfd46f36c01ccdd401eb54b750bc9d962c29ddeb
---
 Android.mk                            | 2 ++
 tools/incident_report/Android.mk      | 3 +++
 tools/incident_section_gen/Android.mk | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/Android.mk b/Android.mk
index 63ad83f6a2161..fb962a24dc082 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1409,6 +1409,8 @@ include $(BUILD_JAVA_LIBRARY)
 # ====  c++ proto host library  ==============================
 include $(CLEAR_VARS)
 LOCAL_MODULE := libplatformprotos
+# b/34740546, work around clang-tidy segmentation fault.
+LOCAL_TIDY_CHECKS := -modernize*
 LOCAL_PROTOC_OPTIMIZE_TYPE := full
 LOCAL_PROTOC_FLAGS := \
     --include_source_info \
diff --git a/tools/incident_report/Android.mk b/tools/incident_report/Android.mk
index 9e56e3d7eeaf0..e57a95949e5a8 100644
--- a/tools/incident_report/Android.mk
+++ b/tools/incident_report/Android.mk
@@ -34,6 +34,9 @@ LOCAL_SHARED_LIBRARIES := \
     libplatformprotos \
     libprotobuf-cpp-full
 
+# b/34740546, work around clang-tidy segmentation fault.
+LOCAL_TIDY_CHECKS := -modernize*
+
 LOCAL_C_FLAGS := \
     -Wno-unused-parameter
 include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/incident_section_gen/Android.mk b/tools/incident_section_gen/Android.mk
index acf3f8327b5c8..05490266576ab 100644
--- a/tools/incident_section_gen/Android.mk
+++ b/tools/incident_section_gen/Android.mk
@@ -21,6 +21,8 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := incident-section-gen
+# b/34740546, work around clang-tidy segmentation fault.
+LOCAL_TIDY_CHECKS := -modernize*
 LOCAL_CFLAGS += -g -O0
 LOCAL_C_INCLUDES := \
     external/protobuf/src