From a7e7624f8f9b1eb1ef5efb6dcafc261b13a75b14 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:06:42 -0700 Subject: [PATCH 01/23] Enforce misc-include-cleaner on boot_config.cc Bug: b/523396865 --- .../cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - .../host/commands/assemble_cvd/boot_config.cc | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 4518362766e..5c6fb85dfbe 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -91,7 +91,6 @@ cf_cc_library( name = "boot_config", srcs = ["boot_config.cc"], hdrs = ["boot_config.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/utils:files", "//cuttlefish/common/libs/utils:size_utils", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc index 1c5eba4d5af..005949fe1f9 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc @@ -16,13 +16,20 @@ #include "cuttlefish/host/commands/assemble_cvd/boot_config.h" -#include -#include +#include +#include #include +#include +#include +#include +#include +#include #include #include #include +#include +#include #include "absl/log/log.h" #include "absl/strings/str_join.h" From 040c386637070f639085436b40ddd5cec3667747 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:13:56 -0700 Subject: [PATCH 02/23] Enforce misc-include-cleaner on assemble_cvd:media Bug: b/523396865 --- .../host/commands/assemble_cvd/BUILD.bazel | 3 ++- .../cuttlefish/host/commands/assemble_cvd/media.cpp | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 5c6fb85dfbe..33744bba511 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -662,15 +662,16 @@ cf_cc_library( name = "media", srcs = ["media.cpp"], hdrs = ["media.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/flag_parser", "//cuttlefish/host/libs/config:config_flag", "//cuttlefish/host/libs/config:config_fragment", "//cuttlefish/host/libs/config:cuttlefish_config", "//cuttlefish/host/libs/config:media", + "//cuttlefish/host/libs/feature", "//cuttlefish/result", "@abseil-cpp//absl/log", "@fruit", + "@jsoncpp", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/media.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/media.cpp index 3a255dbb88c..3be31f72f09 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/media.cpp +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/media.cpp @@ -15,11 +15,24 @@ #include "cuttlefish/host/commands/assemble_cvd/media.h" +#include +#include +#include +#include + #include "absl/log/log.h" +#include "fruit/component.h" +#include "fruit/fruit_forward_decls.h" +#include "fruit/macro.h" +#include "json/value.h" #include "cuttlefish/flag_parser/flag.h" #include "cuttlefish/flag_parser/gflags_compat.h" +#include "cuttlefish/host/libs/config/config_flag.h" +#include "cuttlefish/host/libs/config/config_fragment.h" +#include "cuttlefish/host/libs/config/cuttlefish_config.h" #include "cuttlefish/host/libs/config/media.h" +#include "cuttlefish/host/libs/feature/feature.h" #include "cuttlefish/result/result.h" namespace cuttlefish { From 92e4455b6cd1a21c5775a3e067ebff15ed85b8f4 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:16:32 -0700 Subject: [PATCH 03/23] Enforce include-cleaner on assemble_cvd:touchpad Bug: b/523396865 --- .../host/commands/assemble_cvd/BUILD.bazel | 1 - .../host/commands/assemble_cvd/touchpad.cpp | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 33744bba511..31767b018c0 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -603,7 +603,6 @@ cf_cc_library( name = "touchpad", srcs = ["touchpad.cpp"], hdrs = ["touchpad.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/flag_parser", "//cuttlefish/host/libs/config:config_flag", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/touchpad.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/touchpad.cpp index 086639e0cf0..c35e289cf37 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/touchpad.cpp +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/touchpad.cpp @@ -15,9 +15,21 @@ #include "cuttlefish/host/commands/assemble_cvd/touchpad.h" +#include +#include +#include +#include + +#include "fruit/component.h" +#include "fruit/fruit_forward_decls.h" +#include "fruit/macro.h" + #include "cuttlefish/flag_parser/flag.h" #include "cuttlefish/flag_parser/gflags_compat.h" +#include "cuttlefish/host/libs/config/config_flag.h" +#include "cuttlefish/host/libs/config/cuttlefish_config.h" #include "cuttlefish/host/libs/config/touchpad.h" +#include "cuttlefish/host/libs/feature/feature.h" #include "cuttlefish/result/result.h" namespace cuttlefish { From 27d3275d8d528fa9b7d18e1d97a867b8017c8bd3 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:17:38 -0700 Subject: [PATCH 04/23] Enforce misc-include-cleaner on assemble_cvd:super_image_mixer Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - .../cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 31767b018c0..0ebc94abd8e 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -578,7 +578,6 @@ cf_cc_library( name = "super_image_mixer", srcs = ["super_image_mixer.cc"], hdrs = ["super_image_mixer.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/key_equals_value", "//cuttlefish/common/libs/utils:archive", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc index 339c6bf8bb7..73897a196fd 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc @@ -15,9 +15,8 @@ #include "cuttlefish/host/commands/assemble_cvd/super_image_mixer.h" -#include - #include +#include #include #include #include From ae41bc5788c6b3412e2f0a578e3b34f56e228ffc Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:19:38 -0700 Subject: [PATCH 05/23] Enforce include-cleaner on assemble_cvd:vendor_dlkm_utils Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - .../host/commands/assemble_cvd/vendor_dlkm_utils.cc | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 0ebc94abd8e..175cf4f2b59 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -617,7 +617,6 @@ cf_cc_library( name = "vendor_dlkm_utils", srcs = ["vendor_dlkm_utils.cc"], hdrs = ["vendor_dlkm_utils.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/fs", "//cuttlefish/common/libs/utils:contains", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc index aef14263919..9196254e0f5 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc @@ -16,13 +16,19 @@ #include "cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h" #include +#include +#include +#include #include +#include #include #include #include #include #include +#include +#include #include #include "absl/log/log.h" From 7589dfcdcc23e3a809dbca72cfac4538cad7db65 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:22:17 -0700 Subject: [PATCH 06/23] Enforce include-cleaner on assemble_cvd:required_directories Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 2 +- .../host/commands/assemble_cvd/required_directories.cc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 175cf4f2b59..bf6dbc678f5 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -547,10 +547,10 @@ cf_cc_library( name = "required_directories", srcs = ["required_directories.cc"], hdrs = ["required_directories.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/host/libs/config:config_constants", "//cuttlefish/host/libs/config:cuttlefish_config", + "@abseil-cpp//absl/strings", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/required_directories.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/required_directories.cc index 0c1f26524b7..8a9e7eebfc8 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/required_directories.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/required_directories.cc @@ -15,11 +15,12 @@ #include "cuttlefish/host/commands/assemble_cvd/required_directories.h" -#include - #include +#include #include +#include "absl/strings/str_cat.h" + #include "cuttlefish/host/libs/config/config_constants.h" #include "cuttlefish/host/libs/config/cuttlefish_config.h" From 94b285dda2a4b89d80866aacfa2d3cbc1f4e4539 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:23:35 -0700 Subject: [PATCH 07/23] Enforce misc-include-cleaner on assemble_cvd:resolve_instance_files Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 2 +- .../host/commands/assemble_cvd/resolve_instance_files.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index bf6dbc678f5..516dee90bcf 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -558,7 +558,6 @@ cf_cc_library( name = "resolve_instance_files", srcs = ["resolve_instance_files.cc"], hdrs = ["resolve_instance_files.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/host/commands/assemble_cvd:assemble_cvd_flags", "//cuttlefish/host/commands/assemble_cvd/flags:boot_image", @@ -570,6 +569,7 @@ cf_cc_library( "//cuttlefish/host/libs/config:instance_nums", "//cuttlefish/result", "@abseil-cpp//absl/strings", + "@fmt", "@gflags", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/resolve_instance_files.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/resolve_instance_files.cc index 94a28c3ee1f..f6ee180d63f 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/resolve_instance_files.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/resolve_instance_files.cc @@ -16,16 +16,16 @@ #include "cuttlefish/host/commands/assemble_cvd/resolve_instance_files.h" -#include - #include #include #include #include "absl/strings/str_split.h" +#include "fmt/format.h" #include "gflags/gflags.h" #include "cuttlefish/host/commands/assemble_cvd/assemble_cvd_flags.h" +#include "cuttlefish/host/commands/assemble_cvd/flags/boot_image.h" #include "cuttlefish/host/commands/assemble_cvd/flags/initramfs_path.h" #include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.h" #include "cuttlefish/host/commands/assemble_cvd/flags/super_image.h" From 8ca9f60739ade32bb84be3a67c586d6eac8006e4 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:34:28 -0700 Subject: [PATCH 08/23] Enforce include-cleaner for assemble_cvd:misc_info Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 516dee90bcf..4917b3ade3f 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -517,7 +517,6 @@ cf_cc_library( name = "misc_info", srcs = ["misc_info.cc"], hdrs = ["misc_info.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/utils:contains", "//cuttlefish/host/libs/avb", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc index 023065b8c22..0dfedf2d27a 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/misc_info.cc @@ -17,10 +17,12 @@ #include #include +#include #include #include #include #include +#include #include #include "absl/strings/match.h" From 572907fb418942ad3eee235da7d5098bc059d8ae Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:38:49 -0700 Subject: [PATCH 09/23] Enforce include-cleaner on assemble_cvd:network_flags Bug: b/523396865 --- .../cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 2 -- .../host/commands/assemble_cvd/network_flags.cpp | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 4917b3ade3f..30d7446ebe5 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -531,14 +531,12 @@ cf_cc_library( name = "network_flags", srcs = ["network_flags.cpp"], hdrs = ["network_flags.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/host/commands/cvdalloc:interface", "//cuttlefish/host/libs/config:cuttlefish_config", "//cuttlefish/result", "@abseil-cpp//absl/log", "@abseil-cpp//absl/strings", - "@abseil-cpp//absl/strings:str_format", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/network_flags.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/network_flags.cpp index 6f4ca7da73f..421f29cf503 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/network_flags.cpp +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/network_flags.cpp @@ -18,12 +18,18 @@ #include #include +#include +#include +#include +#include + +#include #include "absl/log/log.h" #include "absl/strings/numbers.h" -#include "absl/strings/str_format.h" #include "cuttlefish/host/commands/cvdalloc/interface.h" +#include "cuttlefish/host/libs/config/cuttlefish_config.h" #include "cuttlefish/result/result.h" namespace cuttlefish { From 049802c38ba71d23c8609170de189c6cb2c3cf03 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:39:51 -0700 Subject: [PATCH 10/23] Enforce include-cleaner on assemble_cvd:instance_image_files Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - .../host/commands/assemble_cvd/instance_image_files.cc | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 30d7446ebe5..d9ea7f7c81a 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -501,7 +501,6 @@ cf_cc_library( name = "instance_image_files", srcs = ["instance_image_files.cc"], hdrs = ["instance_image_files.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/host/commands/assemble_cvd/disk:efi_loader", "//cuttlefish/host/commands/assemble_cvd/disk:image_file", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/instance_image_files.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/instance_image_files.cc index 986cb812510..82e81878f2a 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/instance_image_files.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/instance_image_files.cc @@ -16,6 +16,8 @@ #include "cuttlefish/host/commands/assemble_cvd/instance_image_files.h" #include +#include +#include #include #include "cuttlefish/host/commands/assemble_cvd/disk/efi_loader.h" From 6a6915f91aae424d07782899529a1424bfae35d8 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:40:30 -0700 Subject: [PATCH 11/23] Enforce include-cleaner on assemble_cvd:kernel_module_parser Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - .../host/commands/assemble_cvd/kernel_module_parser.cc | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index d9ea7f7c81a..0bead4e37b1 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -457,7 +457,6 @@ cf_cc_library( name = "kernel_module_parser", srcs = ["kernel_module_parser.cc"], hdrs = ["kernel_module_parser.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/io", "//cuttlefish/io:string", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/kernel_module_parser.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/kernel_module_parser.cc index d23e86ed154..afb06f64352 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/kernel_module_parser.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/kernel_module_parser.cc @@ -15,6 +15,8 @@ #include "cuttlefish/host/commands/assemble_cvd/kernel_module_parser.h" +#include + #include "cuttlefish/io/io.h" #include "cuttlefish/io/string.h" #include "cuttlefish/result/expect.h" From 2fb900e49d20a9d757ee9002f8db0977038c6dce Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:43:59 -0700 Subject: [PATCH 12/23] Enforce include-cleaner on assemble_cvd:graphics_flags Bug: b/523396865 --- .../host/commands/assemble_cvd/BUILD.bazel | 2 +- .../host/commands/assemble_cvd/graphics_flags.cc | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 0bead4e37b1..13e2afa9fe4 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -427,7 +427,6 @@ cf_cc_library( name = "graphics_flags", srcs = ["graphics_flags.cc"], hdrs = ["graphics_flags.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/utils:contains", "//cuttlefish/common/libs/utils:files", @@ -436,6 +435,7 @@ cf_cc_library( "//cuttlefish/host/commands/assemble_cvd:guest_config", "//cuttlefish/host/graphics_detector:graphics_detector_cc_proto", "//cuttlefish/host/libs/config:config_constants", + "//cuttlefish/host/libs/config:config_utils", "//cuttlefish/host/libs/config:cuttlefish_config", "//cuttlefish/host/libs/config:gpu_mode", "//cuttlefish/host/libs/config:guest_hwui_renderer", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc index 099dde8a3ea..fcef013afe8 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc @@ -16,17 +16,23 @@ #include "cuttlefish/host/commands/assemble_cvd/graphics_flags.h" +#include + +#include #include #include +#include +#include +#include #include #include "absl/log/log.h" #include "absl/strings/ascii.h" +#include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" #include "android-base/file.h" #include "fmt/base.h" -#include "fmt/format.h" #include "fmt/ostream.h" #include "google/protobuf/io/tokenizer.h" #include "google/protobuf/text_format.h" @@ -35,8 +41,10 @@ #include "cuttlefish/common/libs/utils/files.h" #include "cuttlefish/common/libs/utils/host_info.h" #include "cuttlefish/common/libs/utils/semver.h" +#include "cuttlefish/host/commands/assemble_cvd/guest_config.h" #include "cuttlefish/host/graphics_detector/graphics_detector.pb.h" #include "cuttlefish/host/libs/config/config_constants.h" +#include "cuttlefish/host/libs/config/config_utils.h" #include "cuttlefish/host/libs/config/cuttlefish_config.h" #include "cuttlefish/host/libs/config/gpu_mode.h" #include "cuttlefish/host/libs/config/guest_hwui_renderer.h" @@ -57,7 +65,7 @@ namespace { struct AggregatingErrorCollector : public google::protobuf::io::ErrorCollector { void RecordError(int /* line */, int /* column */, - const absl::string_view message) override { + const std::string_view message) override { if (!error_message.empty()) { absl::StrAppend(&error_message, "; "); } @@ -65,7 +73,7 @@ struct AggregatingErrorCollector : public google::protobuf::io::ErrorCollector { } void RecordWarning(int /* line */, int /* column */, - const absl::string_view /* message */) override { + const std::string_view /* message */) override { // Ignore warnings } @@ -890,7 +898,7 @@ GetGraphicsAvailabilityWithSubprocessCheck() { } VLOG(0) << "Host Graphics Availability:"; - for (absl::string_view line : + for (std::string_view line : absl::StrSplit(graphics_availability_content, '\n')) { VLOG(0) << line; } From 26f04ce5a9a65a22ff73500cd8baab2c7ed28d11 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:47:57 -0700 Subject: [PATCH 13/23] Enforce misc-include-cleaner on assemble_cvd:guest_config Bug: b/523396865 --- .../host/commands/assemble_cvd/BUILD.bazel | 1 - .../host/commands/assemble_cvd/guest_config.cc | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 13e2afa9fe4..5d96da443d5 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -392,7 +392,6 @@ cf_cc_library( name = "guest_config", srcs = ["guest_config.cc"], hdrs = ["guest_config.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/key_equals_value", "//cuttlefish/common/libs/utils:device_type", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc index 73de7d87393..c33e2ba027e 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc @@ -16,12 +16,16 @@ #include "cuttlefish/host/commands/assemble_cvd/guest_config.h" -#include +#include #include +#include +#include #include #include #include +#include +#include #include #include "absl/strings/match.h" @@ -33,6 +37,7 @@ #include "google/protobuf/text_format.h" #include "cuttlefish/common/libs/key_equals_value/key_equals_value.h" +#include "cuttlefish/common/libs/utils/device_type.h" #include "cuttlefish/common/libs/utils/environment.h" #include "cuttlefish/common/libs/utils/files.h" #include "cuttlefish/common/libs/utils/host_info.h" @@ -46,8 +51,10 @@ #include "cuttlefish/host/libs/config/config_utils.h" #include "cuttlefish/host/libs/config/display.h" #include "cuttlefish/host/libs/config/gpu_mode.h" -#include "cuttlefish/pretty/optional.h" -#include "cuttlefish/pretty/string.h" +#include "cuttlefish/pretty/optional.h" // IWYU pragma: keep: overloads +#include "cuttlefish/pretty/pretty.h" +#include "cuttlefish/pretty/string.h" // IWYU pragma: keep: overloads +#include "cuttlefish/pretty/struct.h" #include "cuttlefish/process/command.h" #include "cuttlefish/process/managed_stdio.h" #include "cuttlefish/result/result.h" From 34bd723c87f251aff2888af2ae793a8dc043b11b Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:50:11 -0700 Subject: [PATCH 14/23] Enforce include-cleaner on assemble_cvd:flag_feature Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - .../cuttlefish/host/commands/assemble_cvd/flag_feature.cpp | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 5d96da443d5..fa94c1c143f 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -292,7 +292,6 @@ cf_cc_library( name = "flag_feature", srcs = ["flag_feature.cpp"], hdrs = ["flag_feature.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/host/libs/config:config_flag", "//cuttlefish/host/libs/feature", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/flag_feature.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/flag_feature.cpp index 64014fd8b23..078437b4a4a 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/flag_feature.cpp +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/flag_feature.cpp @@ -15,14 +15,18 @@ */ #include "cuttlefish/host/commands/assemble_cvd/flag_feature.h" +#include #include #include #include #include "absl/strings/str_replace.h" -#include "fruit/fruit.h" +#include "fruit/component.h" +#include "fruit/fruit_forward_decls.h" +#include "fruit/macro.h" #include "gflags/gflags.h" +#include "cuttlefish/host/libs/config/config_flag.h" #include "cuttlefish/host/libs/feature/feature.h" #include "cuttlefish/result/result.h" From 9381152b18ed0abd245c7a6d201b796b4257b9fa Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 16:52:59 -0700 Subject: [PATCH 15/23] Enforce misc-include-cleaner on assemble_cvd:alloc Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 2 -- base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index fa94c1c143f..2ede4b9064b 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -12,9 +12,7 @@ cf_cc_library( name = "alloc", srcs = ["alloc.cc"], hdrs = ["alloc.h"], - include_cleaner_enabled = False, deps = [ - "//cuttlefish/common/libs/fs", "//cuttlefish/host/commands/cvdalloc:interface", "//cuttlefish/host/libs/config:cuttlefish_config", "//cuttlefish/result", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc index 746a66a57b8..b26b25c9edb 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc @@ -16,14 +16,13 @@ #include "cuttlefish/host/commands/assemble_cvd/alloc.h" -#include -#include +#include #include "absl/strings/numbers.h" #include "absl/strings/str_format.h" -#include "cuttlefish/common/libs/fs/shared_fd.h" #include "cuttlefish/host/commands/cvdalloc/interface.h" +#include "cuttlefish/host/libs/config/cuttlefish_config.h" #include "cuttlefish/result/result.h" namespace cuttlefish { From d82a42615b12a3f83aa17511f6e2284a7136bd3e Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 17:02:32 -0700 Subject: [PATCH 16/23] Enforce include-cleaner on assemble_cvd:assemble_cvd Bug: b/523396865 --- .../host/commands/assemble_cvd/BUILD.bazel | 10 +++++++- .../commands/assemble_cvd/assemble_cvd.cc | 25 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 2ede4b9064b..856644d1e28 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -24,7 +24,6 @@ cf_cc_library( cf_cc_binary( name = "assemble_cvd", srcs = ["assemble_cvd.cc"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/fs", "//cuttlefish/common/libs/utils:contains", @@ -39,10 +38,12 @@ cf_cc_binary( "//cuttlefish/host/commands/assemble_cvd:assemble_cvd_flags", "//cuttlefish/host/commands/assemble_cvd:clean", "//cuttlefish/host/commands/assemble_cvd:create_dynamic_disk_files", + "//cuttlefish/host/commands/assemble_cvd:disk_builder", "//cuttlefish/host/commands/assemble_cvd:display", "//cuttlefish/host/commands/assemble_cvd:flag_feature", "//cuttlefish/host/commands/assemble_cvd:flags", "//cuttlefish/host/commands/assemble_cvd:flags_defaults", + "//cuttlefish/host/commands/assemble_cvd:guest_config", "//cuttlefish/host/commands/assemble_cvd:instance_image_files", "//cuttlefish/host/commands/assemble_cvd:media", "//cuttlefish/host/commands/assemble_cvd:required_directories", @@ -52,6 +53,7 @@ cf_cc_binary( "//cuttlefish/host/commands/assemble_cvd/android_build:android_builds", "//cuttlefish/host/commands/assemble_cvd/android_build:identify_build", "//cuttlefish/host/commands/assemble_cvd/disk:ap_composite_disk", + "//cuttlefish/host/commands/assemble_cvd/disk:chromeos_state", "//cuttlefish/host/commands/assemble_cvd/disk:factory_reset_protected", "//cuttlefish/host/commands/assemble_cvd/disk:image_file", "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image", @@ -66,14 +68,18 @@ cf_cc_binary( "//cuttlefish/host/commands/assemble_cvd/flags:vm_manager", "//cuttlefish/host/libs/command_util", "//cuttlefish/host/libs/config:ap_boot_flow", + "//cuttlefish/host/libs/config:config_constants", "//cuttlefish/host/libs/config:config_flag", + "//cuttlefish/host/libs/config:config_utils", "//cuttlefish/host/libs/config:custom_actions", "//cuttlefish/host/libs/config:cuttlefish_config", "//cuttlefish/host/libs/config:fetcher_configs", + "//cuttlefish/host/libs/config:file_source", "//cuttlefish/host/libs/config:log_string_to_dir", "//cuttlefish/host/libs/config/adb", "//cuttlefish/host/libs/config/defaults", "//cuttlefish/host/libs/config/fastboot", + "//cuttlefish/host/libs/feature", "//cuttlefish/host/libs/feature:inject", "//cuttlefish/host/libs/log_names", "//cuttlefish/posix:symlink", @@ -81,6 +87,8 @@ cf_cc_binary( "//cuttlefish/result", "@abseil-cpp//absl/log", "@abseil-cpp//absl/strings", + "@fmt", + "@fruit", "@gflags", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc index 192f9d65342..afd7d41f5e0 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc @@ -13,14 +13,32 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include +#include +#include + #include +#include +#include +#include +#include +#include +#include #include +#include #include #include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" #include "absl/strings/str_split.h" +#include "fmt/format.h" +#include "fruit/component.h" +#include "fruit/injector.h" #include "gflags/gflags.h" #include "cuttlefish/common/libs/fs/shared_buf.h" @@ -42,11 +60,13 @@ #include "cuttlefish/host/commands/assemble_cvd/clean.h" #include "cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.h" #include "cuttlefish/host/commands/assemble_cvd/disk/ap_composite_disk.h" +#include "cuttlefish/host/commands/assemble_cvd/disk/chromeos_state.h" #include "cuttlefish/host/commands/assemble_cvd/disk/factory_reset_protected.h" #include "cuttlefish/host/commands/assemble_cvd/disk/image_file.h" #include "cuttlefish/host/commands/assemble_cvd/disk/metadata_image.h" #include "cuttlefish/host/commands/assemble_cvd/disk/misc_image.h" #include "cuttlefish/host/commands/assemble_cvd/disk/os_composite_disk.h" +#include "cuttlefish/host/commands/assemble_cvd/disk_builder.h" #include "cuttlefish/host/commands/assemble_cvd/display.h" #include "cuttlefish/host/commands/assemble_cvd/flag_feature.h" #include "cuttlefish/host/commands/assemble_cvd/flags.h" @@ -58,6 +78,7 @@ #include "cuttlefish/host/commands/assemble_cvd/flags/vendor_boot_image.h" #include "cuttlefish/host/commands/assemble_cvd/flags/vm_manager.h" #include "cuttlefish/host/commands/assemble_cvd/flags_defaults.h" +#include "cuttlefish/host/commands/assemble_cvd/guest_config.h" #include "cuttlefish/host/commands/assemble_cvd/instance_image_files.h" #include "cuttlefish/host/commands/assemble_cvd/media.h" #include "cuttlefish/host/commands/assemble_cvd/required_directories.h" @@ -66,13 +87,17 @@ #include "cuttlefish/host/libs/command_util/snapshot_utils.h" #include "cuttlefish/host/libs/config/adb/adb.h" #include "cuttlefish/host/libs/config/ap_boot_flow.h" +#include "cuttlefish/host/libs/config/config_constants.h" #include "cuttlefish/host/libs/config/config_flag.h" +#include "cuttlefish/host/libs/config/config_utils.h" #include "cuttlefish/host/libs/config/custom_actions.h" #include "cuttlefish/host/libs/config/cuttlefish_config.h" #include "cuttlefish/host/libs/config/defaults/defaults.h" #include "cuttlefish/host/libs/config/fastboot/fastboot.h" #include "cuttlefish/host/libs/config/fetcher_configs.h" +#include "cuttlefish/host/libs/config/file_source.h" #include "cuttlefish/host/libs/config/log_string_to_dir.h" +#include "cuttlefish/host/libs/feature/feature.h" #include "cuttlefish/host/libs/feature/inject.h" #include "cuttlefish/host/libs/log_names/log_names.h" #include "cuttlefish/posix/symlink.h" From 501e9430374564c0a5006926e55629643572204e Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 17:04:46 -0700 Subject: [PATCH 17/23] Enforce include-cleaner on assemble_cvd:disk_builder Bug: b/523396865 --- base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 856644d1e28..8f20a734dd1 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -241,7 +241,6 @@ cf_cc_library( name = "disk_builder", srcs = ["disk_builder.cpp"], hdrs = ["disk_builder.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/utils:files", "//cuttlefish/host/libs/config:vmm_mode", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp index f156d470e77..209b5757478 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp @@ -15,8 +15,10 @@ #include "cuttlefish/host/commands/assemble_cvd/disk_builder.h" +#include #include #include +#include #include #include "absl/log/log.h" From 5f353bcb1eebc58200503d76402527fdebba9e4c Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 17:07:24 -0700 Subject: [PATCH 18/23] Enforce include-cleaner on assemble_cvd:clean Bug: b/523396865 --- .../cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 2 -- base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 8f20a734dd1..8202b01cf47 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -173,9 +173,7 @@ cf_cc_library( name = "clean", srcs = ["clean.cc"], hdrs = ["clean.h"], - include_cleaner_enabled = False, deps = [ - "//cuttlefish/common/libs/utils:files", "//cuttlefish/common/libs/utils:in_sandbox", "//cuttlefish/files:directory_contents", "//cuttlefish/host/libs/config:config_utils", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc index 9c78e93be8a..652f3acb26d 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc @@ -17,16 +17,22 @@ #include #include +#include #include +#include +#include +#include +#include +#include #include #include "absl/log/log.h" #include "absl/strings/str_join.h" #include "android-base/file.h" +#include "fmt/format.h" #include "fmt/ranges.h" -#include "cuttlefish/common/libs/utils/files.h" #include "cuttlefish/common/libs/utils/in_sandbox.h" #include "cuttlefish/files/directory_contents.h" #include "cuttlefish/host/libs/config/config_utils.h" From 89ddb5a9f6274e3dfe3e446a2ffe945b3948983c Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 17:13:14 -0700 Subject: [PATCH 19/23] Enforce include-cleaner on assemble_cvd:bootconfig_args Bug: b/523396865 --- .../host/commands/assemble_cvd/BUILD.bazel | 8 ++++++-- .../host/commands/assemble_cvd/bootconfig_args.cpp | 13 +++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 8202b01cf47..05f99bfd500 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -156,16 +156,20 @@ cf_cc_library( name = "bootconfig_args", srcs = ["bootconfig_args.cpp"], hdrs = ["bootconfig_args.h"], - include_cleaner_enabled = False, deps = [ - "//cuttlefish/common/libs/utils:contains", + "//cuttlefish/common/libs/utils:device_type", + "//cuttlefish/common/libs/utils:host_info", "//cuttlefish/common/libs/utils:json", "//cuttlefish/host/libs/config:config_constants", "//cuttlefish/host/libs/config:cuttlefish_config", + "//cuttlefish/host/libs/config:gpu_mode", + "//cuttlefish/host/libs/config:secure_hals", + "//cuttlefish/host/libs/config:vmm_mode", "//cuttlefish/host/libs/vm_manager", "//cuttlefish/result", "@abseil-cpp//absl/log", "@abseil-cpp//absl/strings", + "@fmt", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp index 05bea0c460e..e057ff1d2c1 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp @@ -16,10 +16,14 @@ #include "cuttlefish/host/commands/assemble_cvd/bootconfig_args.h" -#include +#include + #include +#include +#include #include #include +#include #include #include @@ -27,11 +31,16 @@ #include "absl/strings/numbers.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" +#include "fmt/format.h" -#include "cuttlefish/common/libs/utils/contains.h" +#include "cuttlefish/common/libs/utils/device_type.h" +#include "cuttlefish/common/libs/utils/host_info.h" #include "cuttlefish/common/libs/utils/json.h" #include "cuttlefish/host/libs/config/config_constants.h" #include "cuttlefish/host/libs/config/cuttlefish_config.h" +#include "cuttlefish/host/libs/config/gpu_mode.h" +#include "cuttlefish/host/libs/config/secure_hals.h" +#include "cuttlefish/host/libs/config/vmm_mode.h" #include "cuttlefish/host/libs/vm_manager/crosvm_manager.h" #include "cuttlefish/host/libs/vm_manager/qemu_manager.h" #include "cuttlefish/host/libs/vm_manager/vm_manager.h" From aa76e91823eff79d7acd6945dacc3e4cd4a2d67f Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 17:15:24 -0700 Subject: [PATCH 20/23] Enforce include-cleaner on assemble_cvd:create_dynamic_disk_files Bug: b/523396865 --- .../cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 2 -- .../commands/assemble_cvd/create_dynamic_disk_files.cc | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 05f99bfd500..ed69021db9d 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -195,7 +195,6 @@ cf_cc_library( name = "create_dynamic_disk_files", srcs = ["create_dynamic_disk_files.cc"], hdrs = ["create_dynamic_disk_files.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/utils:files", "//cuttlefish/files:file_exists", @@ -235,7 +234,6 @@ cf_cc_library( "//cuttlefish/result", "@abseil-cpp//absl/log", "@abseil-cpp//absl/strings", - "@gflags", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc index 96932fac1f3..d33c17d02cd 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc @@ -16,14 +16,20 @@ #include "cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.h" +#include +#include +#include +#include #include #include +#include #include +#include +#include #include "absl/log/log.h" #include "absl/strings/match.h" -#include "gflags/gflags.h" #include "cuttlefish/common/libs/utils/files.h" #include "cuttlefish/files/file_exists.h" From 2f9f35bd376ce3b987da337ea9907a59a37083c9 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 17:17:51 -0700 Subject: [PATCH 21/23] Enforce include-cleaner on assemble_cvd:display Bug: b/523396865 --- .../cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 2 +- .../cuttlefish/host/commands/assemble_cvd/display.cpp | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index ed69021db9d..1e1e3f8bd85 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -279,7 +279,6 @@ cf_cc_library( name = "display", srcs = ["display.cpp"], hdrs = ["display.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/flag_parser", "//cuttlefish/host/libs/config:config_flag", @@ -290,6 +289,7 @@ cf_cc_library( "//cuttlefish/result", "@abseil-cpp//absl/log", "@fruit", + "@jsoncpp", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/display.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/display.cpp index 75f6c2475ab..a45cf71af94 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/display.cpp +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/display.cpp @@ -15,15 +15,24 @@ #include "cuttlefish/host/commands/assemble_cvd/display.h" +#include #include +#include #include #include "absl/log/log.h" -#include "fruit/fruit.h" +#include "fruit/component.h" +#include "fruit/fruit_forward_decls.h" +#include "fruit/macro.h" +#include "json/value.h" #include "cuttlefish/flag_parser/flag.h" #include "cuttlefish/flag_parser/gflags_compat.h" +#include "cuttlefish/host/libs/config/config_flag.h" +#include "cuttlefish/host/libs/config/config_fragment.h" +#include "cuttlefish/host/libs/config/cuttlefish_config.h" #include "cuttlefish/host/libs/config/display.h" +#include "cuttlefish/host/libs/feature/feature.h" #include "cuttlefish/result/result.h" namespace cuttlefish { From aaace6d0b367088510a45aeaa3974ddb27d379bc Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 17:22:29 -0700 Subject: [PATCH 22/23] Enforce misc-include-cleaner on assemble_cvd:boot_image_utils Bug: b/523396865 --- .../cuttlefish/host/commands/assemble_cvd/BUILD.bazel | 1 - .../commands/assemble_cvd/boot_image/vendor_boot_image.h | 2 ++ .../host/commands/assemble_cvd/boot_image_utils.cc | 9 ++++++++- .../host/commands/assemble_cvd/vendor_dlkm_utils.h | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 1e1e3f8bd85..524204472be 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -119,7 +119,6 @@ cf_cc_library( name = "boot_image_utils", srcs = ["boot_image_utils.cc"], hdrs = ["boot_image_utils.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/fs", "//cuttlefish/common/libs/utils:files", diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h index 5ae137847b2..1170b248b5e 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h @@ -17,6 +17,8 @@ #include +#include +#include #include #include "bootimg.h" diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc index 70ad48bc60a..c7303eb7974 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc @@ -16,14 +16,20 @@ #include "cuttlefish/host/commands/assemble_cvd/boot_image_utils.h" +#include #include +#include #include -#include +#include #include +#include +#include #include #include #include +#include +#include #include "absl/log/check.h" #include "absl/log/log.h" @@ -36,6 +42,7 @@ #include "cuttlefish/host/commands/assemble_cvd/boot_image/boot_image_builder.h" #include "cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h" #include "cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image_builder.h" +#include "cuttlefish/host/commands/assemble_cvd/disk/generate_persistent_bootconfig.h" #include "cuttlefish/host/libs/avb/avb.h" #include "cuttlefish/host/libs/avb/parser.h" #include "cuttlefish/host/libs/config/config_utils.h" diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h index 26ecf415f87..01bb9fa94e2 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.h @@ -33,7 +33,7 @@ Result RepackSuperWithPartition(const std::string& superimg_path, Result BuildVbmetaImage(const std::string& vendor_dlkm_img, const std::string& vbmeta_path); -Result BuildDlkmImage(const std::string& src_dir, const bool is_erofs, +Result BuildDlkmImage(const std::string& src_dir, bool is_erofs, const std::string& partition_name, const std::string& output_image); From e7bbdb5926b93c486f40c8bb726af3ade0d7d9b2 Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Fri, 31 Jul 2026 17:32:45 -0700 Subject: [PATCH 23/23] Enforce include-cleaner in assemble_cvd:flags Bug: b/523396865 --- .../host/commands/assemble_cvd/BUILD.bazel | 6 +++--- .../host/commands/assemble_cvd/flags.cc | 20 +++++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel index 524204472be..568705e2021 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel @@ -310,7 +310,6 @@ cf_cc_library( name = "flags", srcs = ["flags.cc"], hdrs = ["flags.h"], - include_cleaner_enabled = False, deps = [ "//cuttlefish/common/libs/utils:base64", "//cuttlefish/common/libs/utils:container", @@ -326,6 +325,7 @@ cf_cc_library( "//cuttlefish/host/commands/assemble_cvd:display", "//cuttlefish/host/commands/assemble_cvd:graphics_flags", "//cuttlefish/host/commands/assemble_cvd:guest_config", + "//cuttlefish/host/commands/assemble_cvd:guest_config_cc_proto", "//cuttlefish/host/commands/assemble_cvd:media", "//cuttlefish/host/commands/assemble_cvd:network_flags", "//cuttlefish/host/commands/assemble_cvd:touchpad", @@ -354,6 +354,8 @@ cf_cc_library( "//cuttlefish/host/commands/cvdalloc:interface", "//cuttlefish/host/libs/config:ap_boot_flow", "//cuttlefish/host/libs/config:config_constants", + "//cuttlefish/host/libs/config:config_fragment", + "//cuttlefish/host/libs/config:config_utils", "//cuttlefish/host/libs/config:cuttlefish_config", "//cuttlefish/host/libs/config:display", "//cuttlefish/host/libs/config:external_network_mode", @@ -367,13 +369,11 @@ cf_cc_library( "//cuttlefish/host/libs/vhal_proxy_server", "//cuttlefish/host/libs/vm_manager", "//cuttlefish/result", - "//libbase", "@abseil-cpp//absl/log", "@abseil-cpp//absl/strings", "@fmt", "@fruit", "@gflags", - "@jsoncpp", ], ) diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc index cffe45d8b75..9c8419e064e 100644 --- a/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc +++ b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc @@ -15,13 +15,17 @@ */ #include "cuttlefish/host/commands/assemble_cvd/flags.h" +#include #include -#include +#include +#include #include #include #include #include +#include +#include #include #include #include @@ -29,18 +33,17 @@ #include #include #include +#include #include #include "absl/log/log.h" #include "absl/strings/numbers.h" #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" -#include "android-base/file.h" #include "fmt/format.h" -#include "fruit/fruit.h" +#include "fruit/fruit_forward_decls.h" +#include "fruit/injector.h" #include "gflags/gflags.h" -#include "json/json.h" -#include "json/writer.h" #include "cuttlefish/common/libs/utils/base64.h" #include "cuttlefish/common/libs/utils/container.h" @@ -71,6 +74,7 @@ #include "cuttlefish/host/commands/assemble_cvd/flags/memory_mb.h" #include "cuttlefish/host/commands/assemble_cvd/flags/parser.h" #include "cuttlefish/host/commands/assemble_cvd/flags/restart_subprocesses.h" +#include "cuttlefish/host/commands/assemble_cvd/flags/super_image.h" #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h" #include "cuttlefish/host/commands/assemble_cvd/flags/use_cvdalloc.h" #include "cuttlefish/host/commands/assemble_cvd/flags/vendor_boot_image.h" @@ -79,11 +83,15 @@ #include "cuttlefish/host/commands/assemble_cvd/guest_config.h" #include "cuttlefish/host/commands/assemble_cvd/media.h" #include "cuttlefish/host/commands/assemble_cvd/network_flags.h" +#include "cuttlefish/host/commands/assemble_cvd/proto/guest_config.pb.h" #include "cuttlefish/host/commands/assemble_cvd/touchpad.h" #include "cuttlefish/host/commands/cvdalloc/interface.h" #include "cuttlefish/host/libs/config/ap_boot_flow.h" #include "cuttlefish/host/libs/config/config_constants.h" +#include "cuttlefish/host/libs/config/config_fragment.h" +#include "cuttlefish/host/libs/config/config_utils.h" #include "cuttlefish/host/libs/config/cuttlefish_config.h" +#include "cuttlefish/host/libs/config/defaults/defaults.h" #include "cuttlefish/host/libs/config/display.h" #include "cuttlefish/host/libs/config/external_network_mode.h" #include "cuttlefish/host/libs/config/fetcher_configs.h" @@ -722,7 +730,7 @@ Result InitializeCuttlefishConfiguration( auto env_config = const_cast(tmp_config_obj) .ForEnvironment(environment_name); - mutable_env_config.set_group_uuid(std::time(0)); + mutable_env_config.set_group_uuid(time(0)); std::vector enable_wifi_vec = CF_EXPECT(GET_FLAG_BOOL_VALUE(enable_wifi));