Accept generic ImageFiles from AndroidCompositeDiskConfig

This will avoid an expansion of arguments, and is a step towards reusing
the same ImageFile instances between create_dynamic_disk_files.cc and
assemble_cvd.cc without double-creating them.

Bug: b/472374649

Author: Databean

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

@@ -41,6 +41,7 @@ cf_cc_binary(
         "//cuttlefish/host/commands/assemble_cvd:touchpad",
         "//cuttlefish/host/commands/assemble_cvd/disk:ap_composite_disk",
         "//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",
         "//cuttlefish/host/commands/assemble_cvd/disk:misc_image",
         "//cuttlefish/host/commands/assemble_cvd/disk:os_composite_disk",
@@ -160,6 +161,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd/disk:generate_persistent_bootconfig",
         "//cuttlefish/host/commands/assemble_cvd/disk:generate_persistent_vbmeta",
         "//cuttlefish/host/commands/assemble_cvd/disk:hwcomposer_pmem",
+        "//cuttlefish/host/commands/assemble_cvd/disk:image_file",
         "//cuttlefish/host/commands/assemble_cvd/disk:initialize_instance_composite_disk",
         "//cuttlefish/host/commands/assemble_cvd/disk:kernel_ramdisk_repacker",
         "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",

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

@@ -37,6 +37,7 @@
 #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/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"
@@ -338,14 +339,16 @@ Result<const CuttlefishConfig*> InitFilesystemAndCreateConfig(
     // if any device needs to rebuild its composite disk,
     // then don't preserve any files and delete everything.
     for (const auto& instance : config.Instances()) {
-      MetadataImage metadata(instance);
-      MiscImage misc(instance);
+      std::vector<std::unique_ptr<ImageFile>> image_files;
+
+      image_files.emplace_back(std::make_unique<MetadataImage>(instance));
+      image_files.emplace_back(std::make_unique<MiscImage>(instance));
+
       Result<std::optional<ChromeOsStateImage>> chrome_os_state =
           CF_EXPECT(ChromeOsStateImage::Reuse(instance));
       if (chrome_os_state.ok()) {
-        Result<DiskBuilder> os_builder =
-            OsCompositeDiskBuilder(config, instance, *chrome_os_state, metadata,
-                                   misc, system_image_dir);
+        Result<DiskBuilder> os_builder = OsCompositeDiskBuilder(
+            config, instance, *chrome_os_state, image_files, system_image_dir);
         if (!os_builder.ok()) {
           creating_os_disk = true;
         } else {

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

@@ -18,6 +18,7 @@
 
 #include <sys/statvfs.h>
 
+#include <memory>
 #include <string>
 
 #include <android-base/logging.h>
@@ -39,6 +40,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk/generate_persistent_bootconfig.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/generate_persistent_vbmeta.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/hwcomposer_pmem.h"
+#include "cuttlefish/host/commands/assemble_cvd/disk/image_file.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/initialize_instance_composite_disk.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/kernel_ramdisk_repacker.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/metadata_image.h"
@@ -158,14 +160,17 @@ Result<void> CreateDynamicDiskFiles(
       }
     }
 
-    MetadataImage metadata(instance);
-    CF_EXPECT(metadata.Generate());
+    std::vector<std::unique_ptr<ImageFile>> image_files;
 
-    MiscImage misc(instance);
-    CF_EXPECT(misc.Generate());
+    image_files.emplace_back(std::make_unique<MetadataImage>(instance));
+    image_files.emplace_back(std::make_unique<MiscImage>(instance));
+
+    for (auto& image_file : image_files) {
+      CF_EXPECT(image_file->Generate());
+    }
 
     DiskBuilder os_disk_builder = CF_EXPECT(OsCompositeDiskBuilder(
-        config, instance, chrome_os_state, metadata, misc, system_image_dirs));
+        config, instance, chrome_os_state, image_files, system_image_dirs));
     const auto os_built_composite =
         CF_EXPECT(os_disk_builder.BuildCompositeDiskIfNecessary());
 

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/BUILD.bazel

@@ -22,8 +22,7 @@ cf_cc_library(
     hdrs = ["android_composite_disk_config.h"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",
-        "//cuttlefish/host/commands/assemble_cvd/disk:misc_image",
+        "//cuttlefish/host/commands/assemble_cvd/disk:image_file",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/image_aggregator",
@@ -40,8 +39,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/host/commands/assemble_cvd/disk:android_composite_disk_config",
-        "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",
-        "//cuttlefish/host/commands/assemble_cvd/disk:misc_image",
+        "//cuttlefish/host/commands/assemble_cvd/disk:image_file",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/image_aggregator",
@@ -281,9 +279,8 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd/disk:chromeos_composite_disk",
         "//cuttlefish/host/commands/assemble_cvd/disk:chromeos_state",
         "//cuttlefish/host/commands/assemble_cvd/disk:fuchsia_composite_disk",
+        "//cuttlefish/host/commands/assemble_cvd/disk:image_file",
         "//cuttlefish/host/commands/assemble_cvd/disk:linux_composite_disk",
-        "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",
-        "//cuttlefish/host/commands/assemble_cvd/disk:misc_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/libs/config:boot_flow",
         "//cuttlefish/host/libs/config:cuttlefish_config",

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/android_composite_disk_config.cc

@@ -18,16 +18,17 @@
 
 #include <sys/statvfs.h>
 
+#include <functional>
+#include <map>
 #include <optional>
+#include <set>
 #include <string>
 #include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "android-base/strings.h"
 
 #include "cuttlefish/common/libs/utils/files.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/flags/system_image_dir.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/image_aggregator/image_aggregator.h"
@@ -69,7 +70,7 @@ std::optional<ImagePartition> HibernationImage(
 
 Result<std::vector<ImagePartition>> AndroidCompositeDiskConfig(
     const CuttlefishConfig::InstanceSpecific& instance,
-    const MetadataImage& metadata_image, const MiscImage& misc_image,
+    const std::vector<std::unique_ptr<ImageFile>>& image_files,
     const SystemImageDirFlag& system_image_dir) {
   std::vector<ImagePartition> partitions;
 
@@ -92,8 +93,8 @@ Result<std::vector<ImagePartition>> AndroidCompositeDiskConfig(
   const std::map<std::string_view, std::string> primary_paths = {
       {kPartitions.boot, instance.new_boot_image()},
       {kPartitions.init_boot, instance.init_boot_image()},
-      {kPartitions.metadata, CF_EXPECT(metadata_image.Path())},
-      {kPartitions.misc, CF_EXPECT(misc_image.Path())},
+      {kPartitions.metadata, ""},
+      {kPartitions.misc, ""},
       {kPartitions.super, instance.new_super_image()},
       {kPartitions.userdata, instance.new_data_image()},
       {kPartitions.vbmeta, instance.new_vbmeta_image()},
@@ -112,9 +113,18 @@ Result<std::vector<ImagePartition>> AndroidCompositeDiskConfig(
       {kPartitions.userdata, instance.data_image()},
   };
 
+  std::map<std::string, std::string, std::less<void>> dynamic_paths;
+  for (const auto& image_file : image_files) {
+    const auto& [it, inserted] = dynamic_paths.emplace(
+        image_file->Name(), CF_EXPECT(image_file->Path()));
+    CF_EXPECTF(!!inserted, "Duplicate images for '{}'", image_file->Name());
+  }
+
   for (const auto& [partition, path] : primary_paths) {
     std::string path_used;
-    if (FileExists(path)) {
+    if (auto it = dynamic_paths.find(partition); it != dynamic_paths.end()) {
+      path_used = it->second;
+    } else if (FileExists(path)) {
       path_used = path;
     } else if (auto it = fallback_paths.find(partition);
                it != fallback_paths.end() && FileExists(it->second)) {

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/android_composite_disk_config.h

@@ -15,10 +15,10 @@
  */
 #pragma once
 
+#include <memory>
 #include <vector>
 
-#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/image_file.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/image_aggregator/image_aggregator.h"
@@ -27,7 +27,7 @@
 namespace cuttlefish {
 
 Result<std::vector<ImagePartition>> AndroidCompositeDiskConfig(
-    const CuttlefishConfig::InstanceSpecific& instance, const MetadataImage&,
-    const MiscImage&, const SystemImageDirFlag&);
+    const CuttlefishConfig::InstanceSpecific& instance,
+    const std::vector<std::unique_ptr<ImageFile>>&, const SystemImageDirFlag&);
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/android_efi_loader_composite_disk.cc

@@ -16,12 +16,11 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/disk/android_efi_loader_composite_disk.h"
 
+#include <memory>
 #include <vector>
 
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/android_composite_disk_config.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/flags/system_image_dir.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/image_aggregator/gpt_type_guid.h"
@@ -32,10 +31,10 @@ namespace cuttlefish {
 
 Result<std::vector<ImagePartition>> AndroidEfiLoaderCompositeDiskConfig(
     const CuttlefishConfig::InstanceSpecific& instance,
-    const MetadataImage& metadata, const MiscImage& misc,
+    const std::vector<std::unique_ptr<ImageFile>>& image_files,
     const SystemImageDirFlag& system_image_dir) {
   std::vector<ImagePartition> partitions = CF_EXPECT(
-      AndroidCompositeDiskConfig(instance, metadata, misc, system_image_dir));
+      AndroidCompositeDiskConfig(instance, image_files, system_image_dir));
   // Cuttlefish uboot EFI bootflow by default looks at the first partition
   // for EFI application. Thus we put "android_esp" at the beginning.
   partitions.insert(

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/android_efi_loader_composite_disk.h

@@ -16,10 +16,10 @@
 
 #pragma once
 
+#include <memory>
 #include <vector>
 
-#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/image_file.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/image_aggregator/image_aggregator.h"
@@ -28,7 +28,7 @@
 namespace cuttlefish {
 
 Result<std::vector<ImagePartition>> AndroidEfiLoaderCompositeDiskConfig(
-    const CuttlefishConfig::InstanceSpecific& instance, const MetadataImage&,
-    const MiscImage&, const SystemImageDirFlag&);
+    const CuttlefishConfig::InstanceSpecific& instance,
+    const std::vector<std::unique_ptr<ImageFile>>&, const SystemImageDirFlag&);
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/os_composite_disk.cc

@@ -16,6 +16,7 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/disk/os_composite_disk.h"
 
+#include <memory>
 #include <optional>
 #include <vector>
 
@@ -27,9 +28,8 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk/chromeos_composite_disk.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/chromeos_state.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/fuchsia_composite_disk.h"
+#include "cuttlefish/host/commands/assemble_cvd/disk/image_file.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/linux_composite_disk.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_builder.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
 #include "cuttlefish/host/libs/config/boot_flow.h"
@@ -43,15 +43,15 @@ namespace {
 Result<std::vector<ImagePartition>> GetOsCompositeDiskConfig(
     const CuttlefishConfig::InstanceSpecific& instance,
     const std::optional<ChromeOsStateImage>& chrome_os_state,
-    const MetadataImage& metadata, const MiscImage& misc,
+    const std::vector<std::unique_ptr<ImageFile>>& image_files,
     const SystemImageDirFlag& system_image_dir) {
   switch (instance.boot_flow()) {
     case BootFlow::Android:
-      return CF_EXPECT(AndroidCompositeDiskConfig(instance, metadata, misc,
-                                                  system_image_dir));
+      return CF_EXPECT(
+          AndroidCompositeDiskConfig(instance, image_files, system_image_dir));
     case BootFlow::AndroidEfiLoader:
       return CF_EXPECT(AndroidEfiLoaderCompositeDiskConfig(
-          instance, metadata, misc, system_image_dir));
+          instance, image_files, system_image_dir));
     case BootFlow::ChromeOs:
       CHECK(chrome_os_state.has_value());
       return ChromeOsCompositeDiskConfig(instance, *chrome_os_state);
@@ -70,7 +70,7 @@ Result<DiskBuilder> OsCompositeDiskBuilder(
     const CuttlefishConfig& config,
     const CuttlefishConfig::InstanceSpecific& instance,
     const std::optional<ChromeOsStateImage>& chrome_os_state,
-    const MetadataImage& metadata, const MiscImage& misc,
+    const std::vector<std::unique_ptr<ImageFile>>& image_files,
     const SystemImageDirFlag& system_image_dir) {
   auto builder =
       DiskBuilder()
@@ -85,7 +85,7 @@ Result<DiskBuilder> OsCompositeDiskBuilder(
   }
   return builder
       .Partitions(CF_EXPECT(GetOsCompositeDiskConfig(
-          instance, chrome_os_state, metadata, misc, system_image_dir)))
+          instance, chrome_os_state, image_files, system_image_dir)))
       .HeaderPath(instance.PerInstancePath("os_composite_gpt_header.img"))
       .FooterPath(instance.PerInstancePath("os_composite_gpt_footer.img"))
       .CompositeDiskPath(instance.os_composite_disk_path());

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/os_composite_disk.h

@@ -16,11 +16,12 @@
 
 #pragma once
 
+#include <memory>
 #include <optional>
+#include <vector>
 
 #include "cuttlefish/host/commands/assemble_cvd/disk/chromeos_state.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/image_file.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk_builder.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
@@ -31,7 +32,7 @@ namespace cuttlefish {
 Result<DiskBuilder> OsCompositeDiskBuilder(
     const CuttlefishConfig& config,
     const CuttlefishConfig::InstanceSpecific& instance,
-    const std::optional<ChromeOsStateImage>&, const MetadataImage&,
-    const MiscImage&, const SystemImageDirFlag&);
+    const std::optional<ChromeOsStateImage>&,
+    const std::vector<std::unique_ptr<ImageFile>>&, const SystemImageDirFlag&);
 
 }  // namespace cuttlefish