Enforce clang-format on host/libs/confui

Databean · Databean · commit 8ae6af85aaf7 · 2026-06-26T11:26:15.000-07:00
Bug: b/512215781
diff --git a/base/cvd/cuttlefish/host/libs/confui/BUILD.bazel b/base/cvd/cuttlefish/host/libs/confui/BUILD.bazel
@@ -71,7 +71,6 @@ cf_cc_library(
         "sign.h",
         "sign_utils.h",
     ],
-    clang_format_enabled = False,
     deps = [
         "//cuttlefish/common/libs/concurrency",
         "//cuttlefish/common/libs/confui:protocol",
diff --git a/base/cvd/cuttlefish/host/libs/confui/confui_cbor.cc b/base/cvd/cuttlefish/host/libs/confui/confui_cbor.cc
@@ -45,8 +45,9 @@ void Cbor::Init() {
     return;
   }
   auto success = cbor_map_add(
-      cb_map_.get(), (struct cbor_pair){.key = cbor_move(cbor_build_string("prompt")),
-                                  .value = cbor_move(cb_prompt)});
+      cb_map_.get(),
+      (struct cbor_pair){.key = cbor_move(cbor_build_string("prompt")),
+                         .value = cbor_move(cb_prompt)});
   if (!success) {
     // Shouldn't happen, the map has capacity for 2.
     buffer_status_ = Error::OUT_OF_DATA;
@@ -59,8 +60,9 @@ void Cbor::Init() {
     return;
   }
   success = cbor_map_add(
-      cb_map_.get(), (struct cbor_pair){.key = cbor_move(cbor_build_string("extra")),
-                                  .value = cbor_move(cb_extra_data)});
+      cb_map_.get(),
+      (struct cbor_pair){.key = cbor_move(cbor_build_string("extra")),
+                         .value = cbor_move(cb_extra_data)});
   if (!success) {
     // Shouldn't happen, the map has capacity for 2.
     buffer_status_ = Error::MALFORMED;
diff --git a/base/cvd/cuttlefish/host/libs/confui/generate_font_cc.sh b/base/cvd/cuttlefish/host/libs/confui/generate_font_cc.sh
@@ -5,9 +5,13 @@ set -o pipefail
 fontfile="$1"
 varname="$2"
 
+echo "// clang-format off"
+
 # The array variable name is followed by [], while the length variable name ends
 # in _len. This would be much easier with the -n option, but it's not present in
 # all platforms.
 xxd -i "${fontfile}" | \
   sed -e "s|[^ ]*\\[|${varname}\\[|" | \
   sed -e "s|[^ ]*_len |${varname}_length |"
+
+echo "// clang-format on"
diff --git a/base/cvd/cuttlefish/host/libs/confui/host_mode_ctrl.h b/base/cvd/cuttlefish/host/libs/confui/host_mode_ctrl.h
@@ -23,7 +23,7 @@
 #include <functional>
 #include <mutex>
 
-#include <fruit/fruit.h>
+#include "fruit/fruit.h"
 
 #include "cuttlefish/common/libs/confui/utils.h"
 #include "cuttlefish/host/libs/confui/host_utils.h"
@@ -62,10 +62,10 @@ class HostModeCtrl {
    */
   void WaitAndroidMode() {
     ConfUiLogDebug << cuttlefish::confui::thread::GetName()
-                     << "checking atomic Android mode";
+                   << "checking atomic Android mode";
     if (atomic_mode_ == ModeType::kAndroidMode) {
       ConfUiLogDebug << cuttlefish::confui::thread::GetName()
-                       << "returns as it is already Android mode";
+                     << "returns as it is already Android mode";
       return;
     }
     auto check = [this]() -> bool {
@@ -74,24 +74,24 @@ class HostModeCtrl {
     std::unique_lock<std::mutex> lock(mode_mtx_);
     and_mode_cv_.wait(lock, check);
     ConfUiLogDebug << cuttlefish::confui::thread::GetName()
-                     << "awakes from cond var waiting for Android mode";
+                   << "awakes from cond var waiting for Android mode";
   }
 
   void SetMode(const ModeType mode) {
     ConfUiLogDebug << cuttlefish::confui::thread::GetName()
-                     << " tries to acquire the lock in SetMode";
+                   << " tries to acquire the lock in SetMode";
     std::lock_guard<std::mutex> lock(mode_mtx_);
     ConfUiLogDebug << cuttlefish::confui::thread::GetName()
-                     << " acquired the lock in SetMode";
+                   << " acquired the lock in SetMode";
     atomic_mode_ = mode;
     if (atomic_mode_ == ModeType::kAndroidMode) {
       ConfUiLogDebug << cuttlefish::confui::thread::GetName()
-                       << " signals kAndroidMode in SetMode";
+                     << " signals kAndroidMode in SetMode";
       and_mode_cv_.notify_all();
       return;
     }
     ConfUiLogDebug << cuttlefish::confui::thread::GetName()
-                     << "signals kConfUI_Mode in SetMode";
+                   << "signals kConfUI_Mode in SetMode";
     confui_mode_cv_.notify_all();
   }
 
diff --git a/base/cvd/cuttlefish/host/libs/confui/host_renderer.cc b/base/cvd/cuttlefish/host/libs/confui/host_renderer.cc
@@ -21,8 +21,8 @@
 #include <string>
 #include <vector>
 
-#include <drm/drm_fourcc.h>
 #include "absl/log/check.h"
+#include "drm/drm_fourcc.h"
 
 #include "cuttlefish/common/libs/confui/utils.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
@@ -85,8 +85,8 @@ class ConfUiRendererImpl {
   ConfUiRendererImpl(uint32_t display, const std::string& confirmation_msg,
                      const std::string& locale, bool inverted, bool magnified);
 
-  struct Boundary {            // inclusive but.. LayoutElement's size is float
-    uint32_t x, y, w, h;       // (x, y) is the top left
+  struct Boundary {       // inclusive but.. LayoutElement's size is float
+    uint32_t x, y, w, h;  // (x, y) is the top left
   };
 
   template <typename LayoutElement>
@@ -285,8 +285,7 @@ teeui::Error ConfUiRendererImpl::UpdateTranslations() {
 
 void ConfUiRendererImpl::SetDeviceContext(unsigned long long w,
                                           const unsigned long long h,
-                                          bool is_inverted,
-                                          bool is_magnified) {
+                                          bool is_inverted, bool is_magnified) {
   using namespace teeui;
   const auto screen_width = pxs(w);
   const auto screen_height = pxs(h);
@@ -366,8 +365,8 @@ std::unique_ptr<TeeUiFrameWrapper>& ConfUiRendererImpl::RenderRawFrame() {
   return raw_frame_;
 }
 
-std::unique_ptr<TeeUiFrameWrapper> ConfUiRendererImpl::RepaintRawFrame(
-    int w, int h) {
+std::unique_ptr<TeeUiFrameWrapper> ConfUiRendererImpl::RepaintRawFrame(int w,
+                                                                       int h) {
   std::get<teeui::LabelOK>(layout_).setTextColor(kColorEnabled);
   std::get<teeui::LabelCancel>(layout_).setTextColor(kColorEnabled);
 
diff --git a/base/cvd/cuttlefish/host/libs/confui/host_renderer.h b/base/cvd/cuttlefish/host/libs/confui/host_renderer.h
@@ -24,9 +24,9 @@
 #include <tuple>
 #include <vector>
 
-#include <freetype/ftglyph.h>  // $(croot)/external/freetype
-#include <fruit/fruit.h>
-#include <teeui/utils.h>  // $(croot)/system/teeui/libteeui/.../include
+#include "freetype/ftglyph.h"  // $(croot)/external/freetype
+#include "fruit/fruit.h"
+#include "teeui/utils.h"  // $(croot)/system/teeui/libteeui/.../include
 
 #include "cuttlefish/host/libs/confui/layouts/layout.h"
 #include "cuttlefish/host/libs/confui/server_common.h"
diff --git a/base/cvd/cuttlefish/host/libs/confui/host_virtual_input.cc b/base/cvd/cuttlefish/host/libs/confui/host_virtual_input.cc
@@ -157,4 +157,3 @@ std::unique_ptr<InputConnector::EventSink> HostVirtualInput::CreateSink() {
 
 }  // namespace confui
 }  // namespace cuttlefish
-
diff --git a/base/cvd/cuttlefish/host/libs/confui/host_virtual_input.h b/base/cvd/cuttlefish/host/libs/confui/host_virtual_input.h
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <fruit/fruit.h>
+#include "fruit/fruit.h"
 
 #include "cuttlefish/host/libs/confui/host_server.h"
 #include "cuttlefish/host/libs/input_connector/input_connector.h"
diff --git a/base/cvd/cuttlefish/host/libs/confui/layouts/fonts.h b/base/cvd/cuttlefish/host/libs/confui/layouts/fonts.h
@@ -25,4 +25,3 @@ extern unsigned int RobotoRegular_length;
 
 extern unsigned char Shield[];
 extern unsigned int Shield_length;
-
diff --git a/base/cvd/cuttlefish/host/libs/confui/session.cc b/base/cvd/cuttlefish/host/libs/confui/session.cc
@@ -24,8 +24,8 @@
 
 #include "absl/log/log.h"
 
-#include "cuttlefish/common/libs/confui/utils.h"
 #include "cuttlefish/common/libs/confui/protocol.h"
+#include "cuttlefish/common/libs/confui/utils.h"
 #include "cuttlefish/host/libs/confui/secure_input.h"
 
 namespace cuttlefish {
@@ -159,7 +159,7 @@ bool Session::HandleInit(SharedFD hal_cli, const FsmInput fsm_input,
 
   // Start Session
   ConfUiLogVerbose << "Sending ack to hal_cli: "
-                     << Enum2Base(ConfUiCmd::kCliAck);
+                   << Enum2Base(ConfUiCmd::kCliAck);
   host_mode_ctrl_.SetMode(HostModeCtrl::ModeType::kConfUI_Mode);
 
   auto start_cmd_msg = static_cast<const ConfUiStartMessage&>(conf_ui_message);
diff --git a/base/cvd/cuttlefish/host/libs/confui/sign.cc b/base/cvd/cuttlefish/host/libs/confui/sign.cc
@@ -22,9 +22,9 @@
 #include <string>
 #include <vector>
 
-#include <openssl/hmac.h>
-#include <openssl/sha.h>
 #include "absl/log/check.h"
+#include "openssl/hmac.h"
+#include "openssl/sha.h"
 
 #include "cuttlefish/common/libs/confui/utils.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
diff --git a/base/cvd/cuttlefish/host/libs/confui/sign_utils.h b/base/cvd/cuttlefish/host/libs/confui/sign_utils.h
@@ -28,11 +28,11 @@ using hmac_t = auth_token_key_t;
 
 template <typename T>
 auto bytes_cast(const T& v) -> const uint8_t (&)[sizeof(T)] {
-  return *reinterpret_cast<const uint8_t(*)[sizeof(T)]>(&v);
+  return *reinterpret_cast<const uint8_t * [sizeof(T)]>(&v);
 }
 template <typename T>
 auto bytes_cast(T& v) -> uint8_t (&)[sizeof(T)] {
-  return *reinterpret_cast<uint8_t(*)[sizeof(T)]>(&v);
+  return *reinterpret_cast<uint8_t * [sizeof(T)]>(&v);
 }
 
 template <typename IntType, uint32_t byteOrder>
@@ -42,8 +42,7 @@ template <typename IntType>
 struct choose_hton<IntType, __ORDER_LITTLE_ENDIAN__> {
   inline static IntType hton(const IntType& value) {
     IntType result = {};
-    const unsigned char* inbytes =
-        reinterpret_cast<const unsigned char*>(&value);
+    const unsigned char* inbytes = reinterpret_cast<const unsigned char*>(&value);
     unsigned char* outbytes = reinterpret_cast<unsigned char*>(&result);
     for (int i = sizeof(IntType) - 1; i >= 0; --i) {
       *(outbytes++) = inbytes[i];
@@ -73,27 +72,23 @@ class ByteBufferProxy {
     static int* f(const U* u, decltype(u->data())) {
       return nullptr;
     }
-    static constexpr bool value =
-        std::is_pointer<decltype(f((T*)nullptr, ""))>::value;
+    static constexpr bool value = std::is_pointer<decltype(f((T*)nullptr, ""))>::value;
   };
 
  public:
   template <typename T>
   ByteBufferProxy(const T& buffer, decltype(buffer.data()) = nullptr)
-      : data_(reinterpret_cast<const uint8_t*>(buffer.data())),
-        size_(buffer.size()) {
+      : data_(reinterpret_cast<const uint8_t*>(buffer.data())), size_(buffer.size()) {
     static_assert(sizeof(decltype(*buffer.data())) == 1, "elements to large");
   }
 
   // this overload kicks in for types that have .c_str() but not .data(), such
   // as hidl_string. std::string has both so we need to explicitly disable this
   // overload if .data() is present.
   template <typename T>
-  ByteBufferProxy(
-      const T& buffer,
-      std::enable_if_t<!has_data<T>::value, decltype(buffer.c_str())> = nullptr)
-      : data_(reinterpret_cast<const uint8_t*>(buffer.c_str())),
-        size_(buffer.size()) {
+  ByteBufferProxy(const T& buffer,
+                  std::enable_if_t<!has_data<T>::value, decltype(buffer.c_str())> = nullptr)
+      : data_(reinterpret_cast<const uint8_t*>(buffer.c_str())), size_(buffer.size()) {
     static_assert(sizeof(decltype(*buffer.c_str())) == 1, "elements to large");
   }
 

Original file line number	Diff line number	Diff line change
`@@ -157,4 +157,3 @@ std::unique_ptr<InputConnector::EventSink> HostVirtualInput::CreateSink() {`
`157`	`157`
`158`	`158`	`} // namespace confui`
`159`	`159`	`} // namespace cuttlefish`
`160`		`-`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,3 @@ extern unsigned int RobotoRegular_length;`
`25`	`25`
`26`	`26`	`extern unsigned char Shield[];`
`27`	`27`	`extern unsigned int Shield_length;`
`28`		`-`