Switch from bazel_clang_tidy to aspect-build/rules_lint for clang-tidy validaton

.github/workflows/presubmit.yaml

@@ -104,8 +104,6 @@ jobs:
       with:
         name: testlogs
         path: bazel-testlogs
-    - name: Run clang-tidy
-      run: cd base/cvd && bazel build //cuttlefish/... --config clang-tidy
   e2e-tests-orchestration:
     runs-on: ubuntu-22.04 
     steps:

base/cvd/.bazelrc

@@ -1,6 +1 @@
 build --copt=-fdiagnostics-color=always
-
-build:clang-tidy --aspects @bazel_clang_tidy//clang_tidy:clang_tidy.bzl%clang_tidy_aspect
-build:clang-tidy --output_groups=report
-build:clang-tidy --@bazel_clang_tidy//:clang_tidy_config=//:clang_tidy_config
-build:clang-tidy --@bazel_clang_tidy//:clang_tidy_executable=@llvm_toolchain//:clang-tidy

base/cvd/.clang-tidy

@@ -6,7 +6,6 @@ Checks: &checks >-
   clang-diagnostic-*,
   -clang-diagnostic-pragma-once-outside-header,
   misc-definitions-in-headers,
-  misc-static-assert,
   misc-unused-alias-decls,
   readability-avoid-const-params-in-decls,
   readability-const-return-type,
@@ -25,6 +24,7 @@ WarningsAsErrors: >
   *,
   -clang-analyzer-core.uninitialized.Assign,
   -clang-analyzer-core.UndefinedBinaryOperatorResult,
+  -clang-diagnostic-builtin-macro-redefined,
   -clang-diagnostic-pragma-once-outside-header,
   -clang-diagnostic-unused-const-variable,
   -clang-diagnostic-unused-variable,

base/cvd/BUILD.bazel

@@ -9,6 +9,8 @@ package(
     default_visibility = ["//:android_cuttlefish"],
 )
 
+exports_files([".clang-tidy"])
+
 genrule(
     name = "build_version_header",
     srcs = ["build_version.h.in"],

base/cvd/MODULE.bazel

@@ -5,7 +5,8 @@
 # For more details, please check https://github.com/bazelbuild/bazel/issues/18958
 ###############################################################################
 
-bazel_dep(name = "bazel_clang_tidy", dev_dependency = True)
+bazel_dep(name = "aspect_rules_lint", version = "1.0.8", dev_dependency = True)
+bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
 bazel_dep(name = "boringssl", version = "0.20241024.0")
 bazel_dep(name = "curl", version = "8.8.0.bcr.2")
 bazel_dep(name = "fmt", version = "10.2.1")
@@ -30,13 +31,6 @@ git_override(
     remote = "https://github.com/mikael-s-persson/bazel-compile-commands-extractor",
 )
 
-# https://github.com/erenon/bazel_clang_tidy
-git_override(
-    module_name = "bazel_clang_tidy",
-    commit = "f23d924918c581c68cd5cda5f12b4f8198ac0c35",
-    remote = "https://github.com/erenon/bazel_clang_tidy.git",
-)
-
 # Configure and register the toolchain.
 llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
 llvm.toolchain(
@@ -46,3 +40,11 @@ llvm.toolchain(
 use_repo(llvm, "llvm_toolchain")
 
 register_toolchains("@llvm_toolchain//:all")
+
+git_override(
+    module_name = "aspect_rules_lint",
+    # While waiting for https://github.com/aspect-build/rules_lint/pull/472 to
+    # be merged.
+    commit = "62e8aa0e9935bb7db76ead9cc2c1804e4dd740b9",
+    remote = "https://github.com/Databean/rules_lint.git",
+)

base/cvd/cuttlefish/common/libs/fs/BUILD.bazel

@@ -1,4 +1,5 @@
 load("//:build_variables.bzl", "COPTS")
+load("//tools/lint:linters.bzl", "clang_tidy_test")
 
 package(
     default_visibility = ["//:android_cuttlefish"],
@@ -28,6 +29,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "fs_clang_tidy",
+    srcs = [":fs"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_test(
     name = "fs_test",
     srcs = [
@@ -42,3 +49,9 @@ cc_test(
         "@googletest//:gtest_main",
     ],
 )
+
+clang_tidy_test(
+    name = "fs_test_clang_tidy",
+    srcs = [":fs_test"],
+    tags = ["clang_tidy", "clang-tidy"],
+)

base/cvd/cuttlefish/common/libs/utils/BUILD.bazel

@@ -1,4 +1,5 @@
 load("//:build_variables.bzl", "COPTS")
+load("//tools/lint:linters.bzl", "clang_tidy_test")
 
 package(
     default_visibility = ["//:android_cuttlefish"],
@@ -20,6 +21,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "result_clang_tidy",
+    srcs = [":result"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_library(
     name = "result_matchers",
     testonly = 1,
@@ -35,6 +42,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "result_matchers_clang_tidy",
+    srcs = [":result_matchers"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_library(
     name = "utils",
     srcs = [
@@ -92,6 +105,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "utils_clang_tidy",
+    srcs = [":utils"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_test(
     name = "result_test",
     srcs = [
@@ -107,6 +126,12 @@ cc_test(
     ],
 )
 
+clang_tidy_test(
+    name = "result_test_clang_tidy",
+    srcs = [":result_test"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_test(
     name = "utils_test",
     srcs = [
@@ -138,3 +163,9 @@ cc_test(
     # the cmake build rules used for @libxml2.
     features = ["-layering_check"],
 )
+
+clang_tidy_test(
+    name = "utils_test_clang_tidy",
+    srcs = [":utils_test"],
+    tags = ["clang_tidy", "clang-tidy"],
+)

base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel

@@ -1,4 +1,5 @@
 load("//:build_variables.bzl", "COPTS")
+load("//tools/lint:linters.bzl", "clang_tidy_test")
 
 package(
     default_visibility = ["//:android_cuttlefish"],
@@ -15,3 +16,9 @@ cc_library(
         "//cuttlefish/host/libs/config",
     ],
 )
+
+clang_tidy_test(
+    name = "libassemble_cvd_clang_tidy",
+    srcs = [":libassemble_cvd"],
+    tags = ["clang_tidy", "clang-tidy"],
+)

base/cvd/cuttlefish/host/commands/cvd/BUILD.bazel

@@ -1,4 +1,5 @@
 load("//:build_variables.bzl", "COPTS")
+load("//tools/lint:linters.bzl", "clang_tidy_test")
 
 package(
     default_visibility = ["//:android_cuttlefish"],
@@ -24,6 +25,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "libcvd_clang_tidy",
+    srcs = [":libcvd"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_binary(
     name = "cvd",
     srcs = ["main.cc" ],
@@ -39,3 +46,9 @@ cc_binary(
         "@protobuf",
     ],
 )
+
+clang_tidy_test(
+    name = "cvd_clang_tidy",
+    srcs = [":cvd"],
+    tags = ["clang_tidy", "clang-tidy"],
+)

base/cvd/cuttlefish/host/commands/cvd/acloud/BUILD.bazel

@@ -1,4 +1,5 @@
 load("//:build_variables.bzl", "COPTS")
+load("//tools/lint:linters.bzl", "clang_tidy_test")
 
 package(
     default_visibility = ["//:android_cuttlefish"],
@@ -45,3 +46,9 @@ cc_library(
         "@protobuf",
     ],
 )
+
+clang_tidy_test(
+    name = "acloud_clang_tidy",
+    srcs = [":acloud"],
+    tags = ["clang_tidy", "clang-tidy"],
+)

base/cvd/cuttlefish/host/commands/cvd/cache/BUILD.bazel

@@ -1,4 +1,5 @@
 load("//:build_variables.bzl", "COPTS")
+load("//tools/lint:linters.bzl", "clang_tidy_test")
 
 package(
     default_visibility = ["//:android_cuttlefish"],
@@ -18,3 +19,9 @@ cc_library(
         "@jsoncpp",
     ],
 )
+
+clang_tidy_test(
+    name = "cache_clang_tidy",
+    srcs = [":cache"],
+    tags = ["clang_tidy", "clang-tidy"],
+)

base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel

@@ -1,3 +1,5 @@
+load("//tools/lint:linters.bzl", "clang_tidy_test")
+
 package(
     default_visibility = ["//:android_cuttlefish"],
 )
@@ -15,6 +17,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "command_request_clang_tidy",
+    srcs = [":command_request"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_library(
     name = "frontline_parser",
     srcs = ["frontline_parser.cpp"],
@@ -28,6 +36,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "frontline_parser_clang_tidy",
+    srcs = [":frontline_parser"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_library(
     name = "interruptible_terminal",
     srcs = ["interruptible_terminal.cpp"],
@@ -40,6 +54,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "interruptible_terminal_clang_tidy",
+    srcs = [":interruptible_terminal"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 # Commands that may invoke other commands
 cc_library(
     name = "nesting_commands",
@@ -85,12 +105,24 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "nesting_commands_clang_tidy",
+    srcs = [":nesting_commands"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_library(
     name = "types",
     hdrs = ["types.h"],
     strip_include_prefix = "//cuttlefish",
 )
 
+clang_tidy_test(
+    name = "types_clang_tidy",
+    srcs = [":types"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_library(
     name = "utils",
     srcs = ["utils.cpp"],
@@ -108,3 +140,9 @@ cc_library(
         "@fmt",
     ],
 )
+
+clang_tidy_test(
+    name = "utils_clang_tidy",
+    srcs = [":utils"],
+    tags = ["clang_tidy", "clang-tidy"],
+)

base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel

@@ -1,3 +1,5 @@
+load("//tools/lint:linters.bzl", "clang_tidy_test")
+
 package(
     default_visibility = ["//:android_cuttlefish"],
 )
@@ -28,6 +30,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "command_handler_clang_tidy",
+    srcs = [":command_handler"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 cc_library(
     name = "host_tool_target",
     srcs = ["host_tool_target.cpp"],
@@ -42,6 +50,12 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "host_tool_target_clang_tidy",
+    srcs = [":host_tool_target"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+
 # Commands that don't execute other commands
 cc_library(
     name = "leaf_commands",
@@ -134,3 +148,9 @@ cc_library(
     ],
 )
 
+clang_tidy_test(
+    name = "leaf_commands_clang_tidy",
+    srcs = [":leaf_commands"],
+    tags = ["clang_tidy", "clang-tidy"],
+)
+