Create a type to represent the --vendor_boot_image flag

This removes one part of the ordering dependency between
`ResolveInstanceFiles` and `DiskImageFlagsVectorization`.

Bug: b/438587104

Author: Databean

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

@@ -44,6 +44,7 @@ cf_cc_binary(
         "//cuttlefish/host/commands/assemble_cvd/flags:kernel_path",
         "//cuttlefish/host/commands/assemble_cvd/flags:super_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
+        "//cuttlefish/host/commands/assemble_cvd/flags:vendor_boot_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:vm_manager",
         "//cuttlefish/host/libs/command_util",
         "//cuttlefish/host/libs/config:ap_boot_flow",
@@ -201,6 +202,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd/flags:kernel_path",
         "//cuttlefish/host/commands/assemble_cvd/flags:super_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
+        "//cuttlefish/host/commands/assemble_cvd/flags:vendor_boot_image",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:fetcher_config",
         "//cuttlefish/host/libs/config:instance_nums",
@@ -269,6 +271,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd/flags:mcu_config_path",
         "//cuttlefish/host/commands/assemble_cvd/flags:super_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
+        "//cuttlefish/host/commands/assemble_cvd/flags:vendor_boot_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:vm_manager",
         "//cuttlefish/host/libs/config:ap_boot_flow",
         "//cuttlefish/host/libs/config:config_constants",
@@ -405,6 +408,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd/flags:kernel_path",
         "//cuttlefish/host/commands/assemble_cvd/flags:super_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
+        "//cuttlefish/host/commands/assemble_cvd/flags:vendor_boot_image",
         "//cuttlefish/host/libs/config:instance_nums",
         "//libbase",
         "@gflags",

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

@@ -47,6 +47,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.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/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/resolve_instance_files.h"
@@ -320,18 +321,19 @@ Result<const CuttlefishConfig*> InitFilesystemAndCreateConfig(
     const InitramfsPathFlag& initramfs_path, const KernelPathFlag& kernel_path,
     const SuperImageFlag& super_image,
     const SystemImageDirFlag& system_image_dir,
+    const VendorBootImageFlag& vendor_boot_image,
     const VmManagerFlag& vm_manager_flag) {
   {
     // 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, boot_image, initramfs_path, kernel_path,
-                      super_image, system_image_dir, vm_manager_flag),
-                  "cuttlefish configuration initialization failed");
+    auto config = CF_EXPECT(
+        InitializeCuttlefishConfiguration(
+            FLAGS_instance_dir, guest_configs, injector, fetcher_config,
+            boot_image, initramfs_path, kernel_path, super_image,
+            system_image_dir, vendor_boot_image, vm_manager_flag),
+        "cuttlefish configuration initialization failed");
 
     const std::string snapshot_path = FLAGS_snapshot_path;
     if (!snapshot_path.empty()) {
@@ -626,6 +628,9 @@ Result<int> AssembleCvdMain(int argc, char** argv) {
   SuperImageFlag super_image =
       SuperImageFlag::FromGlobalGflags(system_image_dir);
 
+  VendorBootImageFlag vendor_boot_image =
+      VendorBootImageFlag::FromGlobalGflags(system_image_dir);
+
   fruit::Injector<> injector(FlagsComponent, &system_image_dir);
 
   for (auto& late_injected : injector.getMultibindings<LateInjected>()) {
@@ -654,9 +659,10 @@ Result<int> AssembleCvdMain(int argc, char** argv) {
   // gflags either consumes all arguments that start with - or leaves all of
   // them in place, and either errors out on unknown flags or accepts any flags.
 
-  CF_EXPECT(ResolveInstanceFiles(boot_image, initramfs_path, kernel_path,
-                                 super_image, system_image_dir),
-            "Failed to resolve instance files");
+  CF_EXPECT(
+      ResolveInstanceFiles(boot_image, initramfs_path, kernel_path, super_image,
+                           system_image_dir, vendor_boot_image),
+      "Failed to resolve instance files");
   // Depends on ResolveInstanceFiles to set flag globals
   std::vector<GuestConfig> guest_configs =
       CF_EXPECT(ReadGuestConfig(boot_image, kernel_path, system_image_dir));
@@ -671,7 +677,7 @@ Result<int> AssembleCvdMain(int argc, char** argv) {
       CF_EXPECT(InitFilesystemAndCreateConfig(
                     std::move(fetcher_config), guest_configs, injector, log,
                     boot_image, initramfs_path, kernel_path, super_image,
-                    system_image_dir, vm_manager_flag),
+                    system_image_dir, vendor_boot_image, vm_manager_flag),
                 "Failed to create config");
 
   std::cout << GetConfigFilePath(*config) << "\n";

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

@@ -472,10 +472,6 @@ DEFINE_bool(resume, CF_DEFAULTS_RESUME,
             "in. This flag is ignored if the underlying partition "
             "images have been updated since the first launch."
             "If the device starts from a snapshot, this will be always true.");
-DEFINE_string(
-    vendor_boot_image, CF_DEFAULTS_VENDOR_BOOT_IMAGE,
-    "Location of cuttlefish vendor boot image. If empty it is assumed to "
-    "be vendor_boot.img in the directory specified by -system_image_dir.");
 DEFINE_string(vbmeta_image, CF_DEFAULTS_VBMETA_IMAGE,
               "Location of cuttlefish vbmeta image. If empty it is assumed to "
               "be vbmeta.img in the directory specified by -system_image_dir.");

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

@@ -220,7 +220,6 @@ DECLARE_string(instance_dir);
 DECLARE_string(snapshot_path);
 DECLARE_bool(resume);
 
-DECLARE_string(vendor_boot_image);
 DECLARE_string(vbmeta_image);
 DECLARE_string(vbmeta_system_image);
 DECLARE_string(vbmeta_vendor_dlkm_image);

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

@@ -33,6 +33,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.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/vendor_boot_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/super_image_mixer.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
@@ -47,9 +48,8 @@ Result<void> DiskImageFlagsVectorization(
     const BootImageFlag& boot_image, const BootloaderFlag& bootloader,
     const InitramfsPathFlag& initramfs_path, const KernelPathFlag& kernel_path,
     const SuperImageFlag& super_image,
-    const SystemImageDirFlag& system_image_dir) {
-  std::vector<std::string> vendor_boot_image =
-      android::base::Split(FLAGS_vendor_boot_image, ",");
+    const SystemImageDirFlag& system_image_dir,
+    const VendorBootImageFlag& vendor_boot_image) {
   std::vector<std::string> vbmeta_image =
       android::base::Split(FLAGS_vbmeta_image, ",");
   std::vector<std::string> vbmeta_system_image =
@@ -93,7 +93,6 @@ Result<void> DiskImageFlagsVectorization(
       android::base::Split(FLAGS_blank_sdcard_image_mb, ",");
 
   std::string cur_boot_image;
-  std::string cur_vendor_boot_image;
   int value{};
   int instance_index = 0;
   auto instance_nums =
@@ -106,13 +105,10 @@ Result<void> DiskImageFlagsVectorization(
 
     instance.set_init_boot_image(system_image_dir.ForIndex(instance_index) +
                                  "/init_boot.img");
-    if (instance_index >= vendor_boot_image.size()) {
-      cur_vendor_boot_image = vendor_boot_image[0];
-    } else {
-      cur_vendor_boot_image = vendor_boot_image[instance_index];
-    }
-    instance.set_vendor_boot_image(cur_vendor_boot_image);
-    instance.set_new_vendor_boot_image(cur_vendor_boot_image);
+    instance.set_vendor_boot_image(
+        vendor_boot_image.VendorBootImageForIndex(instance_index));
+    instance.set_new_vendor_boot_image(
+        vendor_boot_image.VendorBootImageForIndex(instance_index));
 
     if (instance_index >= vbmeta_image.size()) {
       instance.set_vbmeta_image(vbmeta_image[0]);

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

@@ -24,6 +24,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.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/vendor_boot_image.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
 
@@ -33,6 +34,6 @@ Result<void> DiskImageFlagsVectorization(
     CuttlefishConfig& config, const FetcherConfig& fetcher_config,
     const AndroidEfiLoaderFlag&, const BootImageFlag&, const BootloaderFlag&,
     const InitramfsPathFlag&, const KernelPathFlag&, const SuperImageFlag&,
-    const SystemImageDirFlag&);
+    const SystemImageDirFlag&, const VendorBootImageFlag&);
 
 }  // namespace cuttlefish

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

@@ -56,6 +56,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/mcu_config_path.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
+#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/graphics_flags.h"
 #include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
@@ -368,6 +369,7 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
     const BootImageFlag& boot_image, const InitramfsPathFlag& initramfs_path,
     const KernelPathFlag& kernel_path, const SuperImageFlag& super_image,
     const SystemImageDirFlag& system_image_dir,
+    const VendorBootImageFlag& vendor_boot_image,
     const VmManagerFlag& vm_manager_flag) {
   CuttlefishConfig tmp_config_obj;
   // If a snapshot path is provided, do not read all flags to set up the config.
@@ -1328,7 +1330,8 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
 
   CF_EXPECT(DiskImageFlagsVectorization(
       tmp_config_obj, fetcher_config, efi_loader, boot_image, bootloader,
-      initramfs_path, kernel_path, super_image, system_image_dir));
+      initramfs_path, kernel_path, super_image, system_image_dir,
+      vendor_boot_image));
 
   return tmp_config_obj;
 }

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

@@ -25,6 +25,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.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/vendor_boot_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/vm_manager.h"
 #include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
@@ -42,7 +43,8 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
     fruit::Injector<>& injector, const FetcherConfig& fetcher_config,
     const BootImageFlag&, const InitramfsPathFlag&,
     const KernelPathFlag& kernel_path, const SuperImageFlag&,
-    const SystemImageDirFlag&, const VmManagerFlag&);
+    const SystemImageDirFlag&, const VendorBootImageFlag&,
+    const VmManagerFlag&);
 
 std::string GetConfigFilePath(const CuttlefishConfig& config);
 

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

@@ -144,6 +144,18 @@ cf_cc_library(
     ],
 )
 
+cf_cc_library(
+    name = "vendor_boot_image",
+    srcs = ["vendor_boot_image.cc"],
+    hdrs = ["vendor_boot_image.h"],
+    deps = [
+        "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
+        "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
+        "//libbase",
+        "@gflags",
+    ],
+)
+
 cf_cc_library(
     name = "vm_manager",
     srcs = ["vm_manager.cc"],

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

@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "cuttlefish/host/commands/assemble_cvd/flags/vendor_boot_image.h"
+
+#include <stddef.h>
+
+#include <string>
+#include <vector>
+
+#include <android-base/strings.h>
+#include <gflags/gflags.h>
+
+#include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
+#include "cuttlefish/host/commands/assemble_cvd/flags_defaults.h"
+
+DEFINE_string(
+    vendor_boot_image, CF_DEFAULTS_VENDOR_BOOT_IMAGE,
+    "Location of cuttlefish vendor boot image. If empty it is assumed to "
+    "be vendor_boot.img in the directory specified by -system_image_dir.");
+
+namespace cuttlefish {
+
+VendorBootImageFlag VendorBootImageFlag::FromGlobalGflags(
+    const SystemImageDirFlag& system_image_dir) {
+  gflags::CommandLineFlagInfo flag_info =
+      gflags::GetCommandLineFlagInfoOrDie("vendor_boot_image");
+
+  std::vector<std::string> vendor_boot_images =
+      flag_info.is_default ? std::vector<std::string>{}
+                           : android::base::Split(FLAGS_vendor_boot_image, ",");
+
+  return VendorBootImageFlag(system_image_dir, vendor_boot_images);
+}
+
+std::string VendorBootImageFlag::VendorBootImageForIndex(size_t index) const {
+  if (vendor_boot_images_.empty()) {
+    return system_image_dir_.ForIndex(index) + "/vendor_boot.img";
+  } else if (index < vendor_boot_images_.size()) {
+    return vendor_boot_images_[index];
+  } else {
+    return vendor_boot_images_[0];
+  }
+}
+
+bool VendorBootImageFlag::IsDefault() const {
+  return vendor_boot_images_.empty();
+}
+
+VendorBootImageFlag::VendorBootImageFlag(
+    const SystemImageDirFlag& system_image_dir,
+    std::vector<std::string> vendor_boot_images)
+    : system_image_dir_(system_image_dir),
+      vendor_boot_images_(std::move(vendor_boot_images)) {}
+
+}  // namespace cuttlefish