diff --git a/Android.bp b/Android.bp
index 6b61467b1a278..c80785b29d6e7 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.bp b/tools/incident_report/Android.bp
index 6f21605a99a41..ab55dbd818212 100644
--- a/tools/incident_report/Android.bp
+++ b/tools/incident_report/Android.bp
@@ -32,7 +32,4 @@ cc_binary_host {
     ],
 
     cflags: ["-Wno-unused-parameter"],
-
-    // b/34740546, work around clang-tidy segmentation fault.
-    tidy_checks: ["-modernize*"],
 }
diff --git a/tools/incident_section_gen/Android.bp b/tools/incident_section_gen/Android.bp
index 7f8151f196ae5..1756e06c66fae 100644
--- a/tools/incident_section_gen/Android.bp
+++ b/tools/incident_section_gen/Android.bp
@@ -19,8 +19,6 @@
 // ==========================================================
 cc_binary_host {
     name: "incident-section-gen",
-    // b/34740546, work around clang-tidy segmentation fault.
-    tidy_checks: ["-modernize*"],
     cflags: [
         "-g",
         "-O0",