Update header includes to support fmtlib upgrade

Databean · Databean · commit 1849ad62261f · 2025-08-18T22:08:23.000Z
Port of cl/795513601 internally by another author.

Bug: b/417513896
diff --git a/base/cvd/cuttlefish/common/libs/utils/flag_parser.cpp b/base/cvd/cuttlefish/common/libs/utils/flag_parser.cpp
@@ -39,6 +39,7 @@
 #include <android-base/scopeguard.h>
 #include <android-base/strings.h>
 #include <fmt/format.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/common/libs/utils/tee_logging.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
@@ -126,6 +126,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:subprocess_managed_stdio",
         "//cuttlefish/host/libs/config:config_utils",
         "//libbase",
+        "@fmt",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc
@@ -24,6 +24,7 @@
 #include <android-base/file.h>
 #include <android-base/logging.h>
 #include <android-base/strings.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/utils/in_sandbox.h"
 #include "cuttlefish/common/libs/utils/result.h"
diff --git a/base/cvd/cuttlefish/host/commands/cvd/acloud/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/acloud/BUILD.bazel
@@ -47,6 +47,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/libs/config:config_constants",
         "//libbase",
+        "@fmt",
         "@protobuf",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/cvd/acloud/create_converter_parser.cpp b/base/cvd/cuttlefish/host/commands/cvd/acloud/create_converter_parser.cpp
@@ -24,6 +24,7 @@
 #include <android-base/logging.h>
 #include <android-base/parseint.h>
 #include <android-base/strings.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/utils/flag_parser.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/cache.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/cache.cpp
@@ -24,6 +24,7 @@
 
 #include <fmt/core.h>
 #include <fmt/format.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 #include <json/value.h>
 
 #include "cuttlefish/common/libs/utils/flag_parser.h"
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/cf_configs_common.h b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/cf_configs_common.h
@@ -21,6 +21,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 #include <google/protobuf/message.h>
 #include <json/json.h>
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/request_context.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/request_context.cpp
@@ -22,6 +22,7 @@
 
 #include <android-base/logging.h>
 #include <android-base/strings.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/cli/command_request.h"
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/utils.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/utils.cpp
@@ -24,6 +24,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/contains.h"
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/reset_client_utils.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/reset_client_utils.cpp
@@ -29,6 +29,7 @@
 #include <android-base/parseint.h>
 #include <android-base/strings.h>
 #include <fmt/core.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/common/libs/utils/environment.h"
diff --git a/base/cvd/cuttlefish/host/commands/process_restarter/BUILD.bazel b/base/cvd/cuttlefish/host/commands/process_restarter/BUILD.bazel
@@ -19,5 +19,6 @@ cf_cc_binary(
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:logging",
         "//libbase",
+        "@fmt",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/process_restarter/main.cc b/base/cvd/cuttlefish/host/commands/process_restarter/main.cc
@@ -23,6 +23,7 @@
 #include <vector>
 
 #include <android-base/strings.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/common/libs/utils/result.h"
diff --git a/base/cvd/cuttlefish/host/libs/config/config_flag.cpp b/base/cvd/cuttlefish/host/libs/config/config_flag.cpp
@@ -28,6 +28,7 @@
 #include <android-base/logging.h>
 #include <android-base/strings.h>
 #include <fmt/format.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 #include <fruit/component.h>
 #include <fruit/fruit_forward_decls.h>
 #include <fruit/macro.h>
diff --git a/base/cvd/cuttlefish/host/libs/web/android_build_string.cpp b/base/cvd/cuttlefish/host/libs/web/android_build_string.cpp
@@ -27,6 +27,7 @@
 #include <android-base/strings.h>
 #include <fmt/format.h>
 #include <fmt/ostream.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/utils/flag_parser.h"
 #include "cuttlefish/common/libs/utils/result.h"
diff --git a/base/cvd/cuttlefish/host/libs/web/android_build_url.cpp b/base/cvd/cuttlefish/host/libs/web/android_build_url.cpp
@@ -24,6 +24,7 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 #include <fmt/ostream.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/host/libs/web/http_client/url_escape.h"
 
diff --git a/base/cvd/cuttlefish/host/libs/web/chrome_os_build_string.cpp b/base/cvd/cuttlefish/host/libs/web/chrome_os_build_string.cpp
@@ -24,6 +24,7 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 #include <fmt/ostream.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 
 #include "cuttlefish/common/libs/utils/flag_parser.h"
 #include "cuttlefish/common/libs/utils/result.h"
diff --git a/base/cvd/cuttlefish/host/libs/web/luci_build_api.cpp b/base/cvd/cuttlefish/host/libs/web/luci_build_api.cpp
@@ -25,6 +25,7 @@
 #include <android-base/strings.h>
 #include <fmt/core.h>
 #include <fmt/format.h>
+#include <fmt/ranges.h>  // NOLINT(misc-include-cleaner): version difference
 #include <json/value.h>
 
 #include "cuttlefish/common/libs/utils/json.h"

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ cf_cc_library(`
`126`	`126`	`"//cuttlefish/common/libs/utils:subprocess_managed_stdio",`
`127`	`127`	`"//cuttlefish/host/libs/config:config_utils",`
`128`	`128`	`"//libbase",`
	`129`	`+ "@fmt",`
`129`	`130`	`],`
`130`	`131`	`)`
`131`	`132`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ cf_cc_library(`
`47`	`47`	`"//cuttlefish/host/commands/cvd/utils",`
`48`	`48`	`"//cuttlefish/host/libs/config:config_constants",`
`49`	`49`	`"//libbase",`
	`50`	`+ "@fmt",`
`50`	`51`	`"@protobuf",`
`51`	`52`	`],`
`52`	`53`	`)`