Merge "Work around bugprone-exception-escape bug."
diff --git a/tools/versioner/src/Android.bp b/tools/versioner/src/Android.bp
index 4b237a9..f138cc3 100644
--- a/tools/versioner/src/Android.bp
+++ b/tools/versioner/src/Android.bp
@@ -3,6 +3,9 @@
 
     cpp_std: "gnu++17",
 
+    // b/117120485 bugprone-exception-escape hangs with DeclarationDatabase.cpp
+    tidy_checks: ["-bugprone-exception-escape"],
+
     srcs: [
         "versioner.cpp",
         "Arch.cpp",