Vectorize --enable_host_bluetooth

The flag now means whether a particular device has a bluetooth
implementation that relies on the host (netsimd or rootcanal).

The old code enabled the host bluetooth functionality even when the flag
value was false if netsim_bt was enabled. This behavior is maintained
after this change.

Equivalent to ag/Icc9f4f7b00dc3df87c810edd2565d2f71ea2af95

Bug=b/441907863

Author: jemoreira

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

@@ -131,8 +131,9 @@ DEFINE_vec(
     pause_in_bootloader, CF_DEFAULTS_PAUSE_IN_BOOTLOADER?"true":"false",
     "Stop the bootflow in u-boot. You can continue the boot by connecting "
     "to the device console and typing in \"boot\".");
-DEFINE_bool(enable_host_bluetooth, CF_DEFAULTS_ENABLE_HOST_BLUETOOTH,
-            "Enable the rootcanal which is Bluetooth emulator in the host.");
+DEFINE_vec(enable_host_bluetooth,
+           fmt::format("{}", CF_DEFAULTS_ENABLE_HOST_BLUETOOTH),
+           "Enable the rootcanal which is Bluetooth emulator in the host.");
 DEFINE_int32(
     rootcanal_instance_num, CF_DEFAULTS_ROOTCANAL_INSTANCE_NUM,
     "If it is greater than 0, use an existing rootcanal instance which is "

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

@@ -62,7 +62,7 @@ DECLARE_vec(use_allocd);
 DECLARE_vec(use_cvdalloc);
 DECLARE_vec(enable_minimal_mode);
 DECLARE_vec(pause_in_bootloader);
-DECLARE_bool(enable_host_bluetooth);
+DECLARE_vec(enable_host_bluetooth);
 DECLARE_int32(rootcanal_instance_num);
 DECLARE_string(rootcanal_args);
 DECLARE_bool(enable_host_nfc);

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

@@ -411,17 +411,18 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
   tmp_config_obj.set_ap_rootfs_image(ap_rootfs_image);
   tmp_config_obj.set_ap_kernel_image(FLAGS_ap_kernel_image);
 
+  // get flag default values and store into map
+  auto name_to_default_value = CurrentFlagsToDefaultValue();
+  // old flags but vectorized for multi-device instances
+  int32_t instances_size = instance_nums.size();
+
   // netsim flags allow all radios or selecting a specific radio
   bool is_any_netsim = FLAGS_netsim || FLAGS_netsim_bt || FLAGS_netsim_uwb;
   bool is_bt_netsim = FLAGS_netsim || FLAGS_netsim_bt;
   bool is_uwb_netsim = FLAGS_netsim || FLAGS_netsim_uwb;
 
-  // crosvm should create fifos for Bluetooth
-  tmp_config_obj.set_enable_host_bluetooth(FLAGS_enable_host_bluetooth ||
-                                           is_bt_netsim);
-
-  // rootcanal and bt_connector should handle Bluetooth (instead of netsim)
-  tmp_config_obj.set_enable_host_bluetooth_connector(FLAGS_enable_host_bluetooth && !is_bt_netsim);
+  std::vector<bool> enable_host_bluetooth_vec =
+      CF_EXPECT(GET_FLAG_BOOL_VALUE(enable_host_bluetooth));
 
   tmp_config_obj.set_enable_host_nfc(FLAGS_enable_host_nfc);
   tmp_config_obj.set_enable_host_nfc_connector(FLAGS_enable_host_nfc);
@@ -434,10 +435,6 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
 
   tmp_config_obj.set_enable_automotive_proxy(FLAGS_enable_automotive_proxy);
 
-  // get flag default values and store into map
-  auto name_to_default_value = CurrentFlagsToDefaultValue();
-  // old flags but vectorized for multi-device instances
-  int32_t instances_size = instance_nums.size();
   std::vector<std::string> gnss_file_paths =
       CF_EXPECT(GET_FLAG_STR_VALUE(gnss_file_path));
   std::vector<std::string> fixed_location_file_paths =
@@ -982,6 +979,14 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
 
     instance.set_ethernet_tap_name(iface_config.ethernet_tap.name);
 
+    // crosvm should create fifos for Bluetooth
+    bool enable_host_bluetooth = enable_host_bluetooth_vec[instance_index];
+    // or is_bt_netsim is here for backwards compatibility only
+    instance.set_has_bluetooth(enable_host_bluetooth || is_bt_netsim);
+    // rootcanal and bt_connector should handle Bluetooth (instead of netsim)
+    instance.set_enable_host_bluetooth_connector(enable_host_bluetooth &&
+                                                 !is_bt_netsim);
+
     instance.set_uuid(FLAGS_uuid);
 
     instance.set_environment_name(environment_name);

base/cvd/cuttlefish/host/commands/run_cvd/launch/bluetooth_connector.cpp

@@ -40,7 +40,7 @@ namespace cuttlefish {
 Result<std::optional<MonitorCommand>> BluetoothConnector(
     const CuttlefishConfig& config,
     const CuttlefishConfig::InstanceSpecific& instance) {
-  if (!config.enable_host_bluetooth_connector()) {
+  if (!instance.enable_host_bluetooth_connector()) {
     return {};
   }
   std::vector<std::string> fifo_paths = {

base/cvd/cuttlefish/host/commands/run_cvd/launch/root_canal.cpp

@@ -127,7 +127,8 @@ class RootCanal : public CommandSource {
   // SetupFeature
   std::string Name() const override { return "RootCanal"; }
   bool Enabled() const override {
-    return config_.enable_host_bluetooth_connector() && instance_.start_rootcanal();
+    return instance_.enable_host_bluetooth_connector() &&
+           instance_.start_rootcanal();
   }
 
  private:

base/cvd/cuttlefish/host/libs/config/cuttlefish_config.cpp

@@ -211,23 +211,6 @@ void CuttlefishConfig::set_pica_uci_port(int pica_uci_port) {
   (*dictionary_)[kPicaUciPort] = pica_uci_port;
 }
 
-static constexpr char kEnableHostBluetooth[] = "enable_host_bluetooth";
-void CuttlefishConfig::set_enable_host_bluetooth(bool enable_host_bluetooth) {
-  (*dictionary_)[kEnableHostBluetooth] = enable_host_bluetooth;
-}
-bool CuttlefishConfig::enable_host_bluetooth() const {
-  return (*dictionary_)[kEnableHostBluetooth].asBool();
-}
-
-static constexpr char kEnableHostBluetoothConnector[] =
-    "enable_host_bluetooth_connector";
-void CuttlefishConfig::set_enable_host_bluetooth_connector(bool enable_host_bluetooth) {
-  (*dictionary_)[kEnableHostBluetoothConnector] = enable_host_bluetooth;
-}
-bool CuttlefishConfig::enable_host_bluetooth_connector() const {
-  return (*dictionary_)[kEnableHostBluetoothConnector].asBool();
-}
-
 static constexpr char kEnableAutomotiveProxy[] = "enable_automotive_proxy";
 void CuttlefishConfig::set_enable_automotive_proxy(
     bool enable_automotive_proxy) {

base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h

@@ -125,20 +125,13 @@ class CuttlefishConfig {
   void set_enable_host_uwb_connector(bool enable_host_uwb);
   bool enable_host_uwb_connector() const;
 
-  void set_enable_host_bluetooth(bool enable_host_bluetooth);
-  bool enable_host_bluetooth() const;
-
   void set_enable_automotive_proxy(bool enable_automotive_proxy);
   bool enable_automotive_proxy() const;
 
   // The vsock port used by vhal_proxy_server
   void set_vhal_proxy_server_port(int port);
   int vhal_proxy_server_port() const;
 
-  // Bluetooth is enabled by bt_connector and rootcanal
-  void set_enable_host_bluetooth_connector(bool enable_host_bluetooth);
-  bool enable_host_bluetooth_connector() const;
-
   void set_enable_host_nfc(bool enable_host_nfc);
   bool enable_host_nfc() const;
 
@@ -323,6 +316,10 @@ class CuttlefishConfig {
     std::string ethernet_bridge_name() const;
     std::string ethernet_mac() const;
     std::string ethernet_ipv6() const;
+    bool has_bluetooth() const;
+    // Bluetooth is enabled by bt_connector and rootcanal
+    bool enable_host_bluetooth_connector() const;
+
     uint32_t session_id() const;
     bool use_allocd() const;
     bool use_cvdalloc() const;
@@ -674,6 +671,8 @@ class CuttlefishConfig {
     void set_ethernet_bridge_name(const std::string& set_ethernet_bridge_name);
     void set_ethernet_mac(const std::string& mac);
     void set_ethernet_ipv6(const std::string& ip);
+    void set_has_bluetooth(bool has_bluetooth);
+    void set_enable_host_bluetooth_connector(bool enable_host_bluetooth);
     void set_session_id(uint32_t session_id);
     void set_use_allocd(bool use_allocd);
     void set_use_cvdalloc(bool use_cvdalloc);

base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp

@@ -1596,6 +1596,26 @@ void CuttlefishConfig::MutableInstanceSpecific::set_ethernet_ipv6(
   (*Dictionary())[kEthernetIPV6] = ip;
 }
 
+static constexpr char kHasBluetooth[] = "has_bluetooth";
+bool CuttlefishConfig::InstanceSpecific::has_bluetooth() const {
+  return (*Dictionary())[kHasBluetooth].asBool();
+}
+void CuttlefishConfig::MutableInstanceSpecific::set_has_bluetooth(
+    bool has_bluetooth) {
+  (*Dictionary())[kHasBluetooth] = has_bluetooth;
+}
+
+static constexpr char kRequiresHostBluetoothConnector[] =
+    "enable_host_bluetooth_connector";
+bool CuttlefishConfig::InstanceSpecific::enable_host_bluetooth_connector()
+    const {
+  return (*Dictionary())[kRequiresHostBluetoothConnector].asBool();
+}
+void CuttlefishConfig::MutableInstanceSpecific::
+    set_enable_host_bluetooth_connector(bool enable_host_bluetooth) {
+  (*Dictionary())[kRequiresHostBluetoothConnector] = enable_host_bluetooth;
+}
+
 static constexpr char kUseAllocd[] = "use_allocd";
 bool CuttlefishConfig::InstanceSpecific::use_allocd() const {
   return (*Dictionary())[kUseAllocd].asBool();

base/cvd/cuttlefish/host/libs/vm_manager/crosvm_manager.cpp

@@ -809,7 +809,7 @@ Result<std::vector<MonitorCommand>> CrosvmManager::StartCommands(
       instance.PerInstanceInternalPath("gatekeeper_fifo_vm.in"));
 
   // /dev/hvc5 = bt
-  if (config.enable_host_bluetooth()) {
+  if (instance.has_bluetooth()) {
     crosvm_cmd.AddHvcReadWrite(
         instance.PerInstanceInternalPath("bt_fifo_vm.out"),
         instance.PerInstanceInternalPath("bt_fifo_vm.in"));

base/cvd/cuttlefish/host/libs/vm_manager/qemu_manager.cpp

@@ -568,7 +568,7 @@ Result<std::vector<MonitorCommand>> QemuManager::StartCommands(
   // /dev/hvc4 = gatekeeper
   add_hvc(instance.PerInstanceInternalPath("gatekeeper_fifo_vm"));
   // /dev/hvc5 = bt
-  if (config.enable_host_bluetooth()) {
+  if (instance.has_bluetooth()) {
     add_hvc(instance.PerInstanceInternalPath("bt_fifo_vm"));
   } else {
     add_hvc_sink();