Automate clang_format validation in cf_cc_* macros

- Add clang_format_enabled attribute to cf_cc_binary, cf_cc_library, and cf_cc_test.
- Enable clang_format_enabled = True on kernel_log_monitor and kernel_log_monitor_utils targets.
- Remove redundant manual format_test target in kernel_log_monitor/BUILD.bazel.
- Format kernel_log_server.cc, kernel_log_server.h, utils.cc, and utils.h.

Assisted-by: Jetski <jetski@google.com>
Bug: b/512215781

Author: Databean

base/cvd/cuttlefish/bazel/rules.bzl

@@ -12,22 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@aspect_rules_lint//format:defs.bzl", "format_test")
+load("@cc_compatibility_proxy//:proxy.bzl", "cc_binary", "cc_library", "cc_test")
 load("//:build_variables.bzl", BUILD_VAR_COPTS = "COPTS")
 load("//tools/lint:linters.bzl", "clang_tidy_test")
-load("@cc_compatibility_proxy//:proxy.bzl", "cc_binary", "cc_library", "cc_test")
 
 visibility(["//..."])
 
 COPTS = BUILD_VAR_COPTS
 
-def _cf_cc_binary_implementation(name, clang_tidy_enabled, copts, **kwargs):
+def _cf_cc_binary_implementation(name, clang_format_enabled, clang_tidy_enabled, copts, **kwargs):
     if not clang_tidy_enabled and not kwargs["deprecation"]:
         kwargs["deprecation"] = "Not covered by clang-tidy"
     cc_binary(
         name = name,
         copts = (copts or []) + COPTS,
         **kwargs,
     )
+    if clang_format_enabled:
+        format_test(
+            name = name + "_format_test",
+            cc = "//tools/format:clang_format",
+            disable_git_attribute_checks = True,
+            srcs = (kwargs.get("srcs") or []) + (kwargs.get("hdrs") or []),
+            visibility = ["//visibility:private"],
+        )
     if clang_tidy_enabled:
         clang_tidy_test(
             name = name + "_clang_tidy",
@@ -39,20 +48,29 @@ def _cf_cc_binary_implementation(name, clang_tidy_enabled, copts, **kwargs):
 cf_cc_binary = macro(
     inherit_attrs = cc_binary,
     attrs = {
+        "clang_format_enabled": attr.bool(configurable = False, default = False, doc = "Decide if a corresponding format_test target is generated"),
         "clang_tidy_enabled": attr.bool(configurable = False, default = True, doc = "Decide if a corresponding clang_tidy_test target is generated"),
         "copts": attr.string_list(configurable = False, default = []),
     },
     implementation = _cf_cc_binary_implementation,
 )
 
-def _cf_cc_library_implementation(name, clang_tidy_enabled, copts, **kwargs):
+def _cf_cc_library_implementation(name, clang_format_enabled, clang_tidy_enabled, copts, **kwargs):
     if not clang_tidy_enabled and not kwargs["deprecation"]:
         kwargs["deprecation"] = "Not covered by clang-tidy"
     cc_library(
         name = name,
         copts = (copts or []) + COPTS,
         **kwargs,
     )
+    if clang_format_enabled:
+        format_test(
+            name = name + "_format_test",
+            cc = "//tools/format:clang_format",
+            disable_git_attribute_checks = True,
+            srcs = (kwargs.get("srcs") or []) + (kwargs.get("hdrs") or []),
+            visibility = ["//visibility:private"],
+        )
     if clang_tidy_enabled:
         clang_tidy_test(
             name = name + "_clang_tidy",
@@ -64,13 +82,14 @@ def _cf_cc_library_implementation(name, clang_tidy_enabled, copts, **kwargs):
 cf_cc_library = macro(
     inherit_attrs = cc_library,
     attrs = {
+        "clang_format_enabled": attr.bool(configurable = False, default = False, doc = "Decide if a corresponding format_test target is generated"),
         "clang_tidy_enabled": attr.bool(configurable = False, default = True, doc = "Decide if a corresponding clang_tidy_test target is generated"),
         "copts": attr.string_list(configurable = False, default = []),
     },
     implementation = _cf_cc_library_implementation,
 )
 
-def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, deps, **kwargs):
+def _cf_cc_test_implementation(name, clang_format_enabled, clang_tidy_enabled, copts, deps, **kwargs):
     if not clang_tidy_enabled and not kwargs["deprecation"]:
         kwargs["deprecation"] = "Not covered by clang-tidy"
     cc_test(
@@ -82,6 +101,14 @@ def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, deps, **kwargs):
         ],
         **kwargs,
     )
+    if clang_format_enabled:
+        format_test(
+            name = name + "_format_test",
+            cc = "//tools/format:clang_format",
+            disable_git_attribute_checks = True,
+            srcs = (kwargs.get("srcs") or []) + (kwargs.get("hdrs") or []),
+            visibility = ["//visibility:private"],
+        )
     if clang_tidy_enabled:
         clang_tidy_test(
             name = name + "_clang_tidy",
@@ -93,6 +120,7 @@ def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, deps, **kwargs):
 cf_cc_test = macro(
     inherit_attrs = cc_test,
     attrs = {
+        "clang_format_enabled": attr.bool(configurable = False, default = False, doc = "Decide if a corresponding format_test target is generated"),
         "clang_tidy_enabled": attr.bool(configurable = False, default = True, doc = "Decide if a corresponding clang_tidy_test target is generated"),
         "copts": attr.string_list(configurable = False, default = []),
         "deps": attr.label_list(configurable = False),

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

@@ -1,5 +1,4 @@
 load("//cuttlefish/bazel:rules.bzl", "cf_cc_binary", "cf_cc_library")
-load("@aspect_rules_lint//format:defs.bzl", "format_test")
 
 package(
     default_visibility = ["//:android_cuttlefish"],
@@ -12,6 +11,7 @@ cf_cc_binary(
     srcs = [
         "main.cc",
     ],
+    clang_format_enabled = True,
     deps = [
         ":kernel_log_monitor_utils",
         "//cuttlefish/common/libs/fs",
@@ -29,13 +29,6 @@ cf_cc_binary(
     ],
 )
 
-format_test(
-    name = "kernel_log_monitor_format_test",
-    cc = "//tools/format:clang_format",
-    disable_git_attribute_checks = True,
-    srcs = ["main.cc"],
-)
-
 cf_cc_library(
     name = "kernel_log_monitor_utils",
     srcs = [
@@ -46,6 +39,7 @@ cf_cc_library(
         "kernel_log_server.h",
         "utils.h",
     ],
+    clang_format_enabled = True,
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:json",

base/cvd/cuttlefish/host/commands/kernel_log_monitor/kernel_log_server.cc

@@ -25,14 +25,14 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_split.h"
-#include "absl/log/log.h"
 
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/fs/shared_select.h"
-#include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
+#include "cuttlefish/host/libs/config/cuttlefish_config.h"
 
 namespace cuttlefish::monitor {
 namespace {
@@ -87,8 +87,8 @@ void ProcessSubscriptions(Json::Value message,
     if (action == SubscriptionAction::ContinueSubscription) {
       ++idx;
     } else {
-      // Cancel the subscription by swapping it with the last active subscription
-      // and decreasing the active subscription count
+      // Cancel the subscription by swapping it with the last active
+      // subscription and decreasing the active subscription count
       --active_subscription_count;
       std::swap((*subscribers)[idx], (*subscribers)[active_subscription_count]);
     }
@@ -135,7 +135,7 @@ bool KernelLogServer::HandleIncomingMessage() {
   }
 
   // Detect VIRTUAL_DEVICE_BOOT_*
-  for (ssize_t i=0; i<ret; i++) {
+  for (ssize_t i = 0; i < ret; i++) {
     if ('\n' == buf[i]) {
       for (auto& [match, prefix] : kInformationalPatterns) {
         auto pos = line_.find(match);

base/cvd/cuttlefish/host/commands/kernel_log_monitor/kernel_log_server.h

@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include <json/json.h>
+#include "json/json.h"
 
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/fs/shared_select.h"

base/cvd/cuttlefish/host/commands/kernel_log_monitor/utils.cc

@@ -22,9 +22,9 @@
 #include <optional>
 #include <string>
 
-#include <json/value.h>
-#include <json/writer.h>
 #include "absl/log/log.h"
+#include "json/value.h"
+#include "json/writer.h"
 
 #include "cuttlefish/common/libs/fs/shared_buf.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"

base/cvd/cuttlefish/host/commands/kernel_log_monitor/utils.h

@@ -15,9 +15,10 @@
  */
 #pragma once
 
-#include <json/json.h>
 #include <optional>
 
+#include "json/json.h"
+
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/host/commands/kernel_log_monitor/kernel_log_server.h"
 #include "cuttlefish/result/result.h"