From e7253252708587ad1d1170bdc1b45b6ef1fcb45f Mon Sep 17 00:00:00 2001
From: yawanng <yawanng@google.com>
Date: Sat, 10 Jun 2017 21:38:29 -0700
Subject: [PATCH] Revert work around clang-tidy segmentation fault.

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

Change-Id: Ie0885744bdf07d1a66792b61d8a49305162bcd71
---
 Android.bp                            | 2 --
 tools/incident_report/Android.mk      | 3 ---
 tools/incident_section_gen/Android.mk | 2 --
 3 files changed, 7 deletions(-)

diff --git a/Android.bp b/Android.bp
index 33f3213847f32..cb840cf950da9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,8 +16,6 @@
 cc_library {
     name: "libplatformprotos",
     host_supported: true,
-    // b/34740546, work around clang-tidy segmentation fault.
-    tidy_checks: ["-modernize*"],
     proto: {
         export_proto_headers: true,
         include_dirs: ["external/protobuf/src"],
diff --git a/tools/incident_report/Android.mk b/tools/incident_report/Android.mk
index e57a95949e5a8..9e56e3d7eeaf0 100644
--- a/tools/incident_report/Android.mk
+++ b/tools/incident_report/Android.mk
@@ -34,9 +34,6 @@ 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 05490266576ab..acf3f8327b5c8 100644
--- a/tools/incident_section_gen/Android.mk
+++ b/tools/incident_section_gen/Android.mk
@@ -21,8 +21,6 @@ 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