Migrate use_cvdalloc to a dedicated flag type.

Eventually, we will interpose default value handling for ramping up
enablement of this feature. For now, there should be no functional
changes intended.

Author: 3405691582

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

@@ -282,6 +282,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:use_cvdalloc",
         "//cuttlefish/host/commands/assemble_cvd/flags:vendor_boot_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:vm_manager",
         "//cuttlefish/host/commands/cvdalloc:interface",

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

@@ -115,9 +115,6 @@ DEFINE_vec(
     "Frame socket path to use when launching a VM "
     "For example, \"--frames_socket_path=${XDG_RUNTIME_DIR}/wayland-0\"");
 
-DEFINE_vec(use_cvdalloc, CF_DEFAULTS_USE_CVDALLOC? "true": "false",
-            "Acquire static resources with cvdalloc.");
-
 DEFINE_vec(
     enable_minimal_mode, CF_DEFAULTS_ENABLE_MINIMAL_MODE ? "true" : "false",
     "Only enable the minimum features to boot a cuttlefish device and "

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

@@ -60,6 +60,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/use_cvdalloc.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"
@@ -491,7 +492,8 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
       CF_EXPECT(GET_FLAG_STR_VALUE(serial_number));
   std::vector<bool> use_random_serial_vec =
       CF_EXPECT(GET_FLAG_BOOL_VALUE(use_random_serial));
-  std::vector<bool> use_cvdalloc_vec = CF_EXPECT(GET_FLAG_BOOL_VALUE(use_cvdalloc));
+  UseCvdallocFlag use_cvdalloc_values =
+      CF_EXPECT(UseCvdallocFlag::FromGlobalGflags());
   std::vector<bool> use_sdcard_vec = CF_EXPECT(GET_FLAG_BOOL_VALUE(use_sdcard));
   std::vector<bool> pause_in_bootloader_vec = CF_EXPECT(GET_FLAG_BOOL_VALUE(
       pause_in_bootloader));
@@ -764,7 +766,7 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
     auto const_instance =
         const_cast<const CuttlefishConfig&>(tmp_config_obj).ForInstance(num);
 
-    instance.set_use_cvdalloc(use_cvdalloc_vec[instance_index]);
+    instance.set_use_cvdalloc(use_cvdalloc_values.ForIndex(instance_index));
 
     IfaceConfig iface_config =
         CF_EXPECT(DefaultNetworkInterfaces(const_instance));

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

@@ -211,6 +211,18 @@ cf_cc_library(
     ],
 )
 
+cf_cc_library(
+    name = "use_cvdalloc",
+    srcs = ["use_cvdalloc.cc"],
+    hdrs = ["use_cvdalloc.h"],
+    deps = [
+        "//cuttlefish/common/libs/utils:result",
+        "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
+        "//cuttlefish/host/commands/assemble_cvd/flags:from_gflags",
+        "@gflags",
+    ],
+)
+
 cf_cc_library(
     name = "vendor_boot_image",
     srcs = ["vendor_boot_image.cc"],

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

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2025 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/use_cvdalloc.h"
+
+#include <stddef.h>
+
+#include <utility>
+#include <vector>
+
+#include <gflags/gflags.h>
+
+#include "cuttlefish/common/libs/utils/result.h"
+#include "cuttlefish/host/commands/assemble_cvd/flags/from_gflags.h"
+
+DEFINE_string(use_cvdalloc, "unset", "Acquire static resources with cvdalloc.");
+
+namespace cuttlefish {
+
+Result<UseCvdallocFlag> UseCvdallocFlag::FromGlobalGflags() {
+  const auto flag_info = gflags::GetCommandLineFlagInfoOrDie("use_cvdalloc");
+  std::vector<bool> flag_values =
+      CF_EXPECT(BoolFromGlobalGflags(flag_info, "use_cvdalloc", false));
+  return UseCvdallocFlag(std::move(flag_values));
+}
+
+bool UseCvdallocFlag::ForIndex(const std::size_t index) const {
+  if (index < values_.size()) {
+    return values_[index];
+  } else {
+    return values_[0];
+  }
+}
+
+UseCvdallocFlag::UseCvdallocFlag(std::vector<bool> values)
+    : values_(std::move(values)) {}
+
+}  // namespace cuttlefish

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2025 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.
+ */
+#pragma once
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "cuttlefish/common/libs/utils/result.h"
+
+namespace cuttlefish {
+
+/* `--use_cvdalloc` flag */
+class UseCvdallocFlag {
+ public:
+  static Result<UseCvdallocFlag> FromGlobalGflags();
+
+  bool ForIndex(const std::size_t index) const;
+
+ private:
+  UseCvdallocFlag(std::vector<bool> values);
+
+  std::vector<bool> values_;
+};
+
+}  // namespace cuttlefish