Create a InitramfsPathFlag type to resolve ordering dependencies

https://github.com/google/android-cuttlefish/blob/403b3d6b44e149fe5156dc0150b6a801560bc9fe/base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc#L516

https://github.com/google/android-cuttlefish/blob/403b3d6b44e149fe5156dc0150b6a801560bc9fe/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_flags.cc#L74

https://github.com/google/android-cuttlefish/blob/403b3d6b44e149fe5156dc0150b6a801560bc9fe/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_flags.cc#L436

`ExtractKernelParamsFromFetcherConfig` needs to be called before
`FLAGS_initramfs_path` can be accessed. This is unintuitive. With a custom
type, access to the value can be gated behind correct initialization.

Bug: b/430378744
Test: Fetch with `--kernel_build`
Test: Launch with `--kernel_path` and `--initramfs_path`

Author: Databean

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

@@ -25,6 +25,12 @@ cf_cc_binary(
         "//cuttlefish/common/libs/utils:flag_parser",
         "//cuttlefish/common/libs/utils:in_sandbox",
         "//cuttlefish/common/libs/utils:tee_logging",
+        "//cuttlefish/host/commands/assemble_cvd/disk:factory_reset_protected",
+        "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",
+        "//cuttlefish/host/commands/assemble_cvd/disk:misc_image",
+        "//cuttlefish/host/commands/assemble_cvd/flags:initramfs_path",
+        "//cuttlefish/host/commands/assemble_cvd/flags:kernel_path",
+        "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/commands/assemble_cvd:assemble_cvd_flags",
         "//cuttlefish/host/commands/assemble_cvd:clean",
         "//cuttlefish/host/commands/assemble_cvd:disk_flags",
@@ -33,18 +39,13 @@ cf_cc_binary(
         "//cuttlefish/host/commands/assemble_cvd:flags",
         "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
         "//cuttlefish/host/commands/assemble_cvd:touchpad",
-        "//cuttlefish/host/commands/assemble_cvd/disk:factory_reset_protected",
-        "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",
-        "//cuttlefish/host/commands/assemble_cvd/disk:misc_image",
-        "//cuttlefish/host/commands/assemble_cvd/flags:kernel_path",
-        "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/libs/command_util",
+        "//cuttlefish/host/libs/config/adb",
+        "//cuttlefish/host/libs/config/fastboot",
         "//cuttlefish/host/libs/config:ap_boot_flow",
         "//cuttlefish/host/libs/config:config_flag",
         "//cuttlefish/host/libs/config:custom_actions",
         "//cuttlefish/host/libs/config:fetcher_config",
-        "//cuttlefish/host/libs/config/adb",
-        "//cuttlefish/host/libs/config/fastboot",
         "//cuttlefish/host/libs/feature:inject",
         "//libbase",
         "@gflags",
@@ -161,6 +162,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd/disk:pstore",
         "//cuttlefish/host/commands/assemble_cvd/disk:sd_card",
         "//cuttlefish/host/commands/assemble_cvd/disk:vbmeta_enforce_minimum_size",
+        "//cuttlefish/host/commands/assemble_cvd/flags:initramfs_path",
         "//cuttlefish/host/commands/assemble_cvd/flags:kernel_path",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/libs/avb",
@@ -234,6 +236,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd:network_flags",
         "//cuttlefish/host/commands/assemble_cvd:touchpad",
         "//cuttlefish/host/commands/assemble_cvd/flags:display_proto",
+        "//cuttlefish/host/commands/assemble_cvd/flags:initramfs_path",
         "//cuttlefish/host/commands/assemble_cvd/flags:kernel_path",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/libs/config:ap_boot_flow",

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

@@ -40,6 +40,7 @@
 #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"
+#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/system_image_dir.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags_defaults.h"
@@ -310,17 +311,18 @@ Result<SharedFD> SetLogger(std::string runtime_dir_parent) {
 Result<const CuttlefishConfig*> InitFilesystemAndCreateConfig(
     FetcherConfig fetcher_config, const std::vector<GuestConfig>& guest_configs,
     fruit::Injector<>& injector, SharedFD log,
-    const KernelPathFlag& kernel_path,
+    const InitramfsPathFlag& initramfs_path, const KernelPathFlag& kernel_path,
     const SystemImageDirFlag& system_image_dir) {
   {
     // The config object is created here, but only exists in memory until the
     // SaveConfig line below. Don't launch cuttlefish subprocesses between these
     // two operations, as those will assume they can read the config object from
     // disk.
-    auto config = CF_EXPECT(InitializeCuttlefishConfiguration(
-                                FLAGS_instance_dir, guest_configs, injector,
-                                fetcher_config, kernel_path, system_image_dir),
-                            "cuttlefish configuration initialization failed");
+    auto config = CF_EXPECT(
+        InitializeCuttlefishConfiguration(
+            FLAGS_instance_dir, guest_configs, injector, fetcher_config,
+            initramfs_path, kernel_path, system_image_dir),
+        "cuttlefish configuration initialization failed");
 
     const std::string snapshot_path = FLAGS_snapshot_path;
     if (!snapshot_path.empty()) {
@@ -506,17 +508,6 @@ Result<const CuttlefishConfig*> InitFilesystemAndCreateConfig(
   return config;
 }
 
-const std::string kKernelDefaultPath = "kernel";
-const std::string kInitramfsImg = "initramfs.img";
-static void ExtractKernelParamsFromFetcherConfig(
-    const FetcherConfig& fetcher_config) {
-  std::string discovered_ramdisk =
-      fetcher_config.FindCvdFileWithSuffix(kInitramfsImg);
-
-  SetCommandLineOptionWithMode("initramfs_path", discovered_ramdisk.c_str(),
-                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
-}
-
 Result<void> VerifyConditionsOnSnapshotRestore(
     const std::string& snapshot_path) {
   if (snapshot_path.empty()) {
@@ -580,9 +571,6 @@ Result<int> AssembleCvdMain(int argc, char** argv) {
 
   FetcherConfig fetcher_config = FindFetcherConfig(input_files);
 
-  // set gflags defaults to point to kernel/RD from fetcher config
-  ExtractKernelParamsFromFetcherConfig(fetcher_config);
-
   auto args = ArgsToVec(argc - 1, argv + 1);
 
   bool help = false;
@@ -615,6 +603,8 @@ Result<int> AssembleCvdMain(int argc, char** argv) {
                                          /* remove_flags */ false);
   }
 
+  InitramfsPathFlag initramfs_path =
+      InitramfsPathFlag::FromGlobalGflags(fetcher_config);
   KernelPathFlag kernel_path = KernelPathFlag::FromGlobalGflags(fetcher_config);
 
   SystemImageDirFlag system_image_dir =
@@ -649,13 +639,15 @@ Result<int> AssembleCvdMain(int argc, char** argv) {
   // them in place, and either errors out on unknown flags or accepts any flags.
 
   auto guest_configs =
-      CF_EXPECT(GetGuestConfigAndSetDefaults(kernel_path, system_image_dir),
+      CF_EXPECT(GetGuestConfigAndSetDefaults(initramfs_path, kernel_path,
+                                             system_image_dir),
                 "Failed to parse arguments");
 
-  auto config = CF_EXPECT(InitFilesystemAndCreateConfig(
-                              std::move(fetcher_config), guest_configs,
-                              injector, log, kernel_path, system_image_dir),
-                          "Failed to create config");
+  auto config =
+      CF_EXPECT(InitFilesystemAndCreateConfig(
+                    std::move(fetcher_config), guest_configs, injector, log,
+                    initramfs_path, kernel_path, system_image_dir),
+                "Failed to create config");
 
   std::cout << GetConfigFilePath(*config) << "\n";
   std::cout << std::flush;

base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd_flags.cpp

@@ -58,8 +58,6 @@ DEFINE_string(refresh_rate_hz, "60", "Screen refresh rate in Hertz");
 DEFINE_string(overlays, "",
               "List of displays to overlay. Format is: 'vm_index:display_index "
               "vm_index2:display_index2 [...]'");
-DEFINE_vec(initramfs_path, CF_DEFAULTS_INITRAMFS_PATH,
-              "Path to the initramfs");
 DEFINE_string(extra_kernel_cmdline, CF_DEFAULTS_EXTRA_KERNEL_CMDLINE,
               "Additional flags to put on the kernel command line");
 DEFINE_string(extra_bootconfig_args, CF_DEFAULTS_EXTRA_BOOTCONFIG_ARGS,

base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd_flags.h

@@ -39,7 +39,6 @@ DECLARE_string(y_res);
 DECLARE_string(dpi);
 DECLARE_string(refresh_rate_hz);
 DECLARE_string(overlays);
-DECLARE_vec(initramfs_path);
 DECLARE_string(extra_kernel_cmdline);
 DECLARE_string(extra_bootconfig_args);
 DECLARE_vec(guest_enforce_security);

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

@@ -52,6 +52,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk/sd_card.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/vbmeta_enforce_minimum_size.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk_builder.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/system_image_dir.h"
 #include "cuttlefish/host/commands/assemble_cvd/super_image_mixer.h"
@@ -69,12 +70,13 @@ namespace cuttlefish {
 
 using vm_manager::Gem5Manager;
 
-Result<void> ResolveInstanceFiles(const KernelPathFlag& kernel_path,
+Result<void> ResolveInstanceFiles(const InitramfsPathFlag& initramfs_path,
+                                  const KernelPathFlag& kernel_path,
                                   const SystemImageDirFlag& system_image_dir) {
   // It is conflict (invalid) to pass both kernel_path/initramfs_path
   // and image file paths.
   bool flags_kernel_initramfs_has_input =
-      (!kernel_path.HasValue()) || (!FLAGS_initramfs_path.empty());
+      (!kernel_path.HasValue()) || (!initramfs_path.HasValue());
   bool flags_image_has_input =
       (!FLAGS_super_image.empty()) || (!FLAGS_vendor_boot_image.empty()) ||
       (!FLAGS_vbmeta_vendor_dlkm_image.empty()) ||
@@ -247,7 +249,7 @@ static fruit::Component<> DiskChangesPerInstanceComponent(
 
 Result<void> DiskImageFlagsVectorization(
     CuttlefishConfig& config, const FetcherConfig& fetcher_config,
-    const KernelPathFlag& kernel_path,
+    const InitramfsPathFlag& initramfs_path, const KernelPathFlag& kernel_path,
     const SystemImageDirFlag& system_image_dir) {
   std::vector<std::string> boot_image =
       android::base::Split(FLAGS_boot_image, ",");
@@ -301,13 +303,10 @@ Result<void> DiskImageFlagsVectorization(
 
   std::vector<std::string> bootloader =
       android::base::Split(FLAGS_bootloader, ",");
-  std::vector<std::string> initramfs_path =
-      android::base::Split(FLAGS_initramfs_path, ",");
 
   std::vector<std::string> blank_sdcard_image_mb =
       android::base::Split(FLAGS_blank_sdcard_image_mb, ",");
 
-  std::string cur_initramfs_path;
   std::string cur_boot_image;
   std::string cur_vendor_boot_image;
   std::string cur_super_image;
@@ -434,12 +433,8 @@ Result<void> DiskImageFlagsVectorization(
       instance.set_bootloader(bootloader[instance_index]);
     }
     instance.set_kernel_path(kernel_path.KernelPathForIndex(instance_index));
-    if (instance_index >= initramfs_path.size()) {
-      cur_initramfs_path = initramfs_path[0];
-    } else {
-      cur_initramfs_path = initramfs_path[instance_index];
-    }
-    instance.set_initramfs_path(cur_initramfs_path);
+    instance.set_initramfs_path(
+        initramfs_path.InitramfsPathForIndex(instance_index));
 
     using android::base::ParseInt;
 
@@ -467,12 +462,14 @@ Result<void> DiskImageFlagsVectorization(
                             "/userdata.img");
     instance.set_new_data_image(const_instance.PerInstancePath("userdata.img"));
 
-    if (!kernel_path.KernelPathForIndex(instance_index).empty() ||
-        !cur_initramfs_path.empty()) {
+    bool has_kernel = !kernel_path.KernelPathForIndex(instance_index).empty();
+    bool has_initramfs =
+        !initramfs_path.InitramfsPathForIndex(instance_index).empty();
+    if (has_kernel || has_initramfs) {
       const std::string new_vendor_boot_image_path =
           const_instance.PerInstancePath("vendor_boot_repacked.img");
       // Repack the vendor boot images if kernels and/or ramdisks are passed in.
-      if (!cur_initramfs_path.empty()) {
+      if (has_initramfs) {
         // change the new flag value to corresponding instance
         instance.set_new_vendor_boot_image(new_vendor_boot_image_path.c_str());
       }
@@ -491,10 +488,10 @@ Result<void> DiskImageFlagsVectorization(
 
     // We will need to rebuild vendor_dlkm if custom ramdisk is specified, as a
     // result super image would need to be rebuilt as well.
-    if (CF_EXPECT(SuperImageNeedsRebuilding(fetcher_config,
-                  const_instance.default_target_zip(),
-                  const_instance.system_target_zip())) ||
-        !cur_initramfs_path.empty()) {
+    if (CF_EXPECT(SuperImageNeedsRebuilding(
+            fetcher_config, const_instance.default_target_zip(),
+            const_instance.system_target_zip())) ||
+        has_initramfs) {
       const std::string new_super_image_path =
           const_instance.PerInstancePath("super.img");
       instance.set_new_super_image(new_super_image_path);

base/cvd/cuttlefish/host/commands/assemble_cvd/disk_flags.h

@@ -20,21 +20,24 @@
 #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/initramfs_path.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
 
 namespace cuttlefish {
 
-Result<void> ResolveInstanceFiles(const KernelPathFlag& kernel_path,
+Result<void> ResolveInstanceFiles(const InitramfsPathFlag&,
+                                  const KernelPathFlag& kernel_path,
                                   const SystemImageDirFlag& system_image_dir);
 
 Result<void> CreateDynamicDiskFiles(const FetcherConfig& fetcher_config,
                                     const CuttlefishConfig& config,
                                     const SystemImageDirFlag&);
 Result<void> DiskImageFlagsVectorization(CuttlefishConfig& config,
                                          const FetcherConfig& fetcher_config,
+                                         const InitramfsPathFlag&,
                                          const KernelPathFlag&,
                                          const SystemImageDirFlag&);
 DiskBuilder OsCompositeDiskBuilder(

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

@@ -53,6 +53,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk_flags.h"
 #include "cuttlefish/host/commands/assemble_cvd/display.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/display_proto.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/system_image_dir.h"
 #include "cuttlefish/host/commands/assemble_cvd/graphics_flags.h"
@@ -593,7 +594,7 @@ std::string DefaultBootloaderArchDir(Arch arch) {
 Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
     const std::string& root_dir, const std::vector<GuestConfig>& guest_configs,
     fruit::Injector<>& injector, const FetcherConfig& fetcher_config,
-    const KernelPathFlag& kernel_path,
+    const InitramfsPathFlag& initramfs_path, const KernelPathFlag& kernel_path,
     const SystemImageDirFlag& system_image_dir) {
   CuttlefishConfig tmp_config_obj;
   // If a snapshot path is provided, do not read all flags to set up the config.
@@ -1602,7 +1603,8 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
             "The set of flags is incompatible with snapshot");
 
   CF_EXPECT(DiskImageFlagsVectorization(tmp_config_obj, fetcher_config,
-                                        kernel_path, system_image_dir));
+                                        initramfs_path, kernel_path,
+                                        system_image_dir));
 
   return tmp_config_obj;
 }
@@ -1801,13 +1803,13 @@ void SetDefaultFlagsForOpenwrt(Arch target_arch) {
 }
 
 Result<std::vector<GuestConfig>> GetGuestConfigAndSetDefaults(
-    const KernelPathFlag& kernel_path,
+    const InitramfsPathFlag& initramfs_path, const KernelPathFlag& kernel_path,
     const SystemImageDirFlag& system_image_dir) {
   auto instance_nums =
       CF_EXPECT(InstanceNumsCalculator().FromGlobalGflags().Calculate());
   int32_t instances_size = instance_nums.size();
 
-  CF_EXPECT(ResolveInstanceFiles(kernel_path, system_image_dir),
+  CF_EXPECT(ResolveInstanceFiles(initramfs_path, kernel_path, system_image_dir),
             "Failed to resolve instance files");
 
   std::vector<GuestConfig> guest_configs =

base/cvd/cuttlefish/host/commands/assemble_cvd/flags.h

@@ -20,6 +20,7 @@
 #include <fruit/fruit.h>
 
 #include "cuttlefish/common/libs/utils/result.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/system_image_dir.h"
 #include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
@@ -29,12 +30,13 @@
 namespace cuttlefish {
 
 Result<std::vector<GuestConfig>> GetGuestConfigAndSetDefaults(
-    const KernelPathFlag&, const SystemImageDirFlag&);
+    const InitramfsPathFlag&, const KernelPathFlag&, const SystemImageDirFlag&);
 // Must be called after ParseCommandLineFlags.
 Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
     const std::string& root_dir, const std::vector<GuestConfig>& guest_configs,
     fruit::Injector<>& injector, const FetcherConfig& fetcher_config,
-    const KernelPathFlag& kernel_path, const SystemImageDirFlag&);
+    const InitramfsPathFlag&, const KernelPathFlag& kernel_path,
+    const SystemImageDirFlag&);
 
 std::string GetConfigFilePath(const CuttlefishConfig& config);
 

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

@@ -34,6 +34,18 @@ cf_cc_library(
     ],
 )
 
+cf_cc_library(
+    name = "initramfs_path",
+    srcs = ["initramfs_path.cc"],
+    hdrs = ["initramfs_path.h"],
+    deps = [
+        "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
+        "//cuttlefish/host/libs/config:fetcher_config",
+        "//libbase",
+        "@gflags",
+    ],
+)
+
 cf_cc_library(
     name = "kernel_path",
     srcs = ["kernel_path.cc"],