Add default_vvmtruststore_file_name parameter

Re-applying the change from AOSP:
https://android-review.git.corp.google.com/c/device/google/cuttlefish/+/3551899

If- vvmtruststore_path is not specified, but
-default_vvmtruststore_file_name is specified then the
vvmtruststore_path defaults to the file with the name
default_vvmtruststore_file_name within the directory specified by
-system_image_dir.

This behavior is similer to the existing behavior of other images with
the exception that there the default image file names are hard-coded.

Author: istvannador

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

@@ -87,8 +87,17 @@ DEFINE_string(
     "to "
     "be vbmeta_system_dlkm.img in the directory specified by "
     "-system_image_dir.");
+DEFINE_string(default_vvmtruststore_file_name,
+              CF_DEFAULTS_DEFAULT_VVMTRUSTSTORE_FILE_NAME,
+              "If the vvmtruststore_path parameter is empty then the default "
+              "file name of the vvmtruststore image in the directory specified"
+              " by -system_image_dir. If empty then there's no vvmtruststore "
+              "image assumed by default.");
 DEFINE_string(vvmtruststore_path, CF_DEFAULTS_VVMTRUSTSTORE_PATH,
-              "Location of the vvmtruststore image");
+              "Location of the vvmtruststore image. If empty and the "
+              "default_vvmtruststore_file_name parameter is not empty then the "
+              "image file is assumed to be the default_vvmtruststore_file_name "
+              "file in the directory specified by -system_image_dir.");
 
 DEFINE_string(
     default_target_zip, CF_DEFAULTS_DEFAULT_TARGET_ZIP,
@@ -188,11 +197,14 @@ Result<void> ResolveInstanceFiles() {
   std::string default_16k_kernel_image = "";
   std::string default_16k_ramdisk_image = "";
   std::string default_hibernation_image = "";
+  std::string vvmtruststore_path = "";
 
   std::string cur_system_image_dir;
   std::string comma_str = "";
   auto instance_nums =
       CF_EXPECT(InstanceNumsCalculator().FromGlobalGflags().Calculate());
+  auto default_vvmtruststore_file_name =
+      android::base::Split(FLAGS_default_vvmtruststore_file_name, ",");
   for (int instance_index = 0; instance_index < instance_nums.size(); instance_index++) {
     if (instance_index < system_image_dir.size()) {
       cur_system_image_dir = system_image_dir[instance_index];
@@ -231,6 +243,15 @@ Result<void> ResolveInstanceFiles() {
       CF_EXPECT(FileExists(ramdisk_16k),
                 ramdisk_16k + " missing for launching 16k cuttlefish");
     }
+
+    if (instance_index < default_vvmtruststore_file_name.size()) {
+      if (default_vvmtruststore_file_name[instance_index].empty()) {
+        vvmtruststore_path += comma_str;
+      } else {
+        vvmtruststore_path += comma_str + cur_system_image_dir + "/" +
+                              default_vvmtruststore_file_name[instance_index];
+      }
+    }
   }
   if (FLAGS_use_16k) {
     LOG(INFO) << "Using 16k kernel: " << default_16k_kernel_image;
@@ -271,7 +292,8 @@ Result<void> ResolveInstanceFiles() {
   SetCommandLineOptionWithMode("hibernation_image",
                                default_hibernation_image.c_str(),
                                google::FlagSettingMode::SET_FLAGS_DEFAULT);
-
+  SetCommandLineOptionWithMode("vvmtruststore_path", vvmtruststore_path.c_str(),
+                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
   return {};
 }
 

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

@@ -132,6 +132,7 @@
 #define CF_DEFAULTS_VBMETA_VENDOR_DLKM_IMAGE CF_DEFAULTS_DYNAMIC_STRING
 #define CF_DEFAULTS_VBMETA_SYSTEM_DLKM_IMAGE CF_DEFAULTS_DYNAMIC_STRING
 #define CF_DEFAULTS_VENDOR_BOOT_IMAGE CF_DEFAULTS_DYNAMIC_STRING
+#define CF_DEFAULTS_DEFAULT_VVMTRUSTSTORE_FILE_NAME CF_DEFAULTS_DYNAMIC_STRING
 #define CF_DEFAULTS_VVMTRUSTSTORE_PATH CF_DEFAULTS_DYNAMIC_STRING
 #define CF_DEFAULTS_DEFAULT_TARGET_ZIP CF_DEFAULTS_DYNAMIC_STRING
 #define CF_DEFAULTS_SYSTEM_TARGET_ZIP CF_DEFAULTS_DYNAMIC_STRING