Index: llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-tidy/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-tidy/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-tidy/BUILD.gn
@@ -22,14 +22,12 @@
     # ClangSACheckers
   ]
 
-  # TODO(mbonadei): Add support for Clang Static Analyzer checkers.
-  # Without this, "clang-analyzer-" will not work.
-  # if (clang_enable_static_analyzer) {
-  #   deps += [
-  #     "//clang/lib/StaticAnalyzer/Core",
-  #     "//clang/lib/StaticAnalyzer/Frontend",
-  #   ]
-  # }
+  if (clang_enable_static_analyzer) {
+    deps += [
+      "//clang/lib/StaticAnalyzer/Core",
+      "//clang/lib/StaticAnalyzer/Frontend",
+    ]
+  }
 
   sources = [
     "ClangTidy.cpp",