Remove the wifi bridge from the flags/config.
This is vestigial; it was only used by libvirt which is now deleted.
Test: Run with qemu, connect to the wifi network
Change-Id: I14a17d8640e4c453c6c8a19120dd70a48c1c2640
diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index 351cb79..cd2e126 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -140,8 +140,6 @@
DEFINE_string(host_mac_address,
"42:00:00:00:00:00",
"MAC address of the wifi interface running on the host.");
-DEFINE_string(wifi_interface, "", // default handled on ParseCommandLine
- "Network interface to use for wifi");
DEFINE_string(wifi_tap_name, "", // default handled on ParseCommandLine
"The name of the tap interface to use for wifi");
DEFINE_int32(vsock_guest_cid,
@@ -367,7 +365,6 @@
tmp_config_obj.set_mobile_tap_name(FLAGS_mobile_tap_name);
ConfigureRil(&tmp_config_obj);
- tmp_config_obj.set_wifi_bridge_name(FLAGS_wifi_interface);
tmp_config_obj.set_wifi_tap_name(FLAGS_wifi_tap_name);
tmp_config_obj.set_wifi_guest_mac_addr(FLAGS_guest_mac_address);
@@ -442,10 +439,6 @@
SetCommandLineOptionWithMode("mobile_tap_name",
default_mobile_tap_name.c_str(),
google::FlagSettingMode::SET_FLAGS_DEFAULT);
- auto default_wifi_interface = GetPerInstanceDefault("cvd-wbr-");
- SetCommandLineOptionWithMode("wifi_interface",
- default_wifi_interface.c_str(),
- google::FlagSettingMode::SET_FLAGS_DEFAULT);
auto default_wifi_tap_name = GetPerInstanceDefault("cvd-wtap-");
SetCommandLineOptionWithMode("wifi_tap_name",
default_wifi_tap_name.c_str(),
@@ -474,10 +467,6 @@
SetCommandLineOptionWithMode("mobile_tap_name",
default_mobile_tap_name.c_str(),
google::FlagSettingMode::SET_FLAGS_DEFAULT);
- auto default_wifi_interface = GetPerInstanceDefault("cvd-wbr-");
- SetCommandLineOptionWithMode("wifi_interface",
- default_wifi_interface.c_str(),
- google::FlagSettingMode::SET_FLAGS_DEFAULT);
auto default_wifi_tap_name = GetPerInstanceDefault("cvd-wtap-");
SetCommandLineOptionWithMode("wifi_tap_name",
default_wifi_tap_name.c_str(),
diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index ada6dc6..56fc40b 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -111,7 +111,6 @@
const char* kMobileBridgeName = "mobile_bridge_name";
const char* kMobileTapName = "mobile_tap_name";
-const char* kWifiBridgeName = "wifi_bridge_name";
const char* kWifiTapName = "wifi_tap_name";
const char* kWifiGuestMacAddr = "wifi_guest_mac_addr";
const char* kWifiHostMacAddr = "wifi_host_mac_addr";
@@ -471,14 +470,6 @@
(*dictionary_)[kMobileBridgeName] = mobile_bridge_name;
}
-std::string CuttlefishConfig::wifi_bridge_name() const {
- return (*dictionary_)[kWifiBridgeName].asString();
-}
-void CuttlefishConfig::set_wifi_bridge_name(
- const std::string& wifi_bridge_name) {
- (*dictionary_)[kWifiBridgeName] = wifi_bridge_name;
-}
-
std::string CuttlefishConfig::wifi_guest_mac_addr() const {
return (*dictionary_)[kWifiGuestMacAddr].asString();
}
diff --git a/host/libs/config/cuttlefish_config.h b/host/libs/config/cuttlefish_config.h
index 933cdca..9ce528e 100644
--- a/host/libs/config/cuttlefish_config.h
+++ b/host/libs/config/cuttlefish_config.h
@@ -191,9 +191,6 @@
std::string mobile_tap_name() const;
void set_mobile_tap_name(const std::string& mobile_tap_name);
- std::string wifi_bridge_name() const;
- void set_wifi_bridge_name(const std::string& wifi_bridge_name);
-
std::string wifi_tap_name() const;
void set_wifi_tap_name(const std::string& wifi_tap_name);
