diff --git a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h index ac219407182..94e867bdd76 100644 --- a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h +++ b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h @@ -221,10 +221,6 @@ class CuttlefishConfig { void set_rootcanal_test_port(int rootcanal_test_port); int rootcanal_test_port() const; - // The path of an AP image in composite disk - std::string ap_image_dev_path() const; - void set_ap_image_dev_path(const std::string& dev_path); - // path to the saved snapshot file(s) std::string snapshot_path() const; void set_snapshot_path(const std::string& snapshot_path); @@ -277,8 +273,6 @@ class CuttlefishConfig { int qemu_vnc_server_port() const; // Port number to connect to the tombstone receiver on the host int tombstone_receiver_port() const; - // Port number to connect to the config server on the host - int config_server_port() const; // Port number to connect to the audiocontrol server on the guest int audiocontrol_server_port() const; // Port number to connect to the adb server on the host @@ -370,7 +364,6 @@ class CuttlefishConfig { std::string sdcard_overlay_path() const; std::string persistent_composite_disk_path() const; - std::string persistent_composite_overlay_path() const; std::string persistent_ap_composite_disk_path() const; std::string persistent_ap_composite_overlay_path() const; @@ -384,10 +377,6 @@ class CuttlefishConfig { std::string esp_image_path() const; - std::string otheros_esp_grub_config() const; - - std::string ap_esp_grub_config() const; - std::string audio_server_path() const; BootFlow boot_flow() const; @@ -623,12 +612,6 @@ class CuttlefishConfig { void set_serial_number(const std::string& serial_number); void set_qemu_vnc_server_port(int qemu_vnc_server_port); void set_tombstone_receiver_port(int tombstone_receiver_port); - void set_config_server_port(int config_server_port); - void set_frames_server_port(int config_server_port); - void set_touch_server_port(int config_server_port); - void set_keyboard_server_port(int config_server_port); - void set_gatekeeper_vsock_port(int gatekeeper_vsock_port); - void set_keymaster_vsock_port(int keymaster_vsock_port); void set_audiocontrol_server_port(int audiocontrol_server_port); void set_lights_server_port(int lights_server_port); void set_adb_host_port(int adb_host_port); diff --git a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp index 85ee82fa541..b87375e08ed 100644 --- a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp +++ b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp @@ -1388,11 +1388,6 @@ std::string CuttlefishConfig::InstanceSpecific::persistent_composite_disk_path() return AbsolutePath(PerInstancePath("persistent_composite.img")); } -std::string -CuttlefishConfig::InstanceSpecific::persistent_composite_overlay_path() const { - return AbsolutePath(PerInstancePath("persistent_composite_overlay.img")); -} - std::string CuttlefishConfig::InstanceSpecific::persistent_ap_composite_disk_path() const { return AbsolutePath(PerInstancePath("ap_persistent_composite.img")); @@ -1426,14 +1421,6 @@ std::string CuttlefishConfig::InstanceSpecific::ap_esp_image_path() const { return AbsolutePath(PerInstancePath("ap_esp.img")); } -std::string CuttlefishConfig::InstanceSpecific::otheros_esp_grub_config() const { - return AbsolutePath(PerInstancePath("grub.cfg")); -} - -std::string CuttlefishConfig::InstanceSpecific::ap_esp_grub_config() const { - return AbsolutePath(PerInstancePath("ap_grub.cfg")); -} - static constexpr char kMobileBridgeName[] = "mobile_bridge_name"; std::string CuttlefishConfig::InstanceSpecific::audio_server_path() const { @@ -1736,14 +1723,6 @@ void CuttlefishConfig::MutableInstanceSpecific::set_audiocontrol_server_port(int (*Dictionary())[kAudioControlServerPort] = audiocontrol_server_port; } -static constexpr char kConfigServerPort[] = "config_server_port"; -int CuttlefishConfig::InstanceSpecific::config_server_port() const { - return (*Dictionary())[kConfigServerPort].asInt(); -} -void CuttlefishConfig::MutableInstanceSpecific::set_config_server_port(int config_server_port) { - (*Dictionary())[kConfigServerPort] = config_server_port; -} - static constexpr char kLightsServerPort[] = "lights_server_port"; int CuttlefishConfig::InstanceSpecific::lights_server_port() const { return (*Dictionary())[kLightsServerPort].asInt();