Enforce include-cleaner in assemble_cvd

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",
@@ -26,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",
@@ -41,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",
@@ -54,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",
@@ -68,21 +68,27 @@ 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",
         "//cuttlefish/pretty:vector",
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
+        "@fmt",
+        "@fruit",
         "@gflags",
     ],
 )
@@ -91,7 +97,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",
@@ -114,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",
@@ -151,26 +155,28 @@ 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",
     ],
 )
 
 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",
@@ -188,7 +194,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",
@@ -228,15 +233,13 @@ cf_cc_library(
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
-        "@gflags",
     ],
 )
 
 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",
@@ -275,7 +278,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",
@@ -286,14 +288,14 @@ cf_cc_library(
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@fruit",
+        "@jsoncpp",
     ],
 )
 
 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",
@@ -308,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",
@@ -324,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",
@@ -352,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",
@@ -365,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",
     ],
 )
 
@@ -393,7 +395,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",
@@ -428,7 +429,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",
@@ -437,6 +437,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",
@@ -458,7 +459,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",
@@ -502,7 +502,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",
@@ -518,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",
@@ -533,33 +531,30 @@ 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",
     ],
 )
 
 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",
     ],
 )
 
 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",
@@ -571,6 +566,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:instance_nums",
         "//cuttlefish/result",
         "@abseil-cpp//absl/strings",
+        "@fmt",
         "@gflags",
     ],
 )
@@ -579,7 +575,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",
@@ -604,7 +599,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",
@@ -620,7 +614,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",
@@ -663,15 +656,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",
     ],
 )

base/cvd/cuttlefish/host/commands/assemble_cvd/alloc.cc

@@ -16,14 +16,13 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/alloc.h"
 
-#include <iomanip>
-#include <sstream>
+#include <string>
 
 #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 {