Revert "Uses realpath() when setting config file paths"
This reverts commit 89618900b3920afc315d8f874bb02c486697025b.
Reason for revert: bug 111640251
Change-Id: Idd2ec7e06bb87a69461e6bd885f86bf896962e36
diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index ce95dcb..9104b54 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -162,16 +162,9 @@
return (*dictionary_)[kKernelImagePath].asString();
}
-void CuttlefishConfig::SetPath(const std::string& key,
- const std::string& path) {
- if (!path.empty()) {
- (*dictionary_)[key] = cvd::RealPath(path);
- }
-}
-
void CuttlefishConfig::set_kernel_image_path(
const std::string& kernel_image_path) {
- SetPath(kKernelImagePath, kernel_image_path);
+ (*dictionary_)[kKernelImagePath] = kernel_image_path;
}
std::string CuttlefishConfig::gdb_flag() const {
@@ -180,7 +173,7 @@
void CuttlefishConfig::set_gdb_flag(
const std::string& device) {
- SetPath(kGdbFlag, device);
+ (*dictionary_)[kGdbFlag] = device;
}
std::string CuttlefishConfig::kernel_args() const {
@@ -195,7 +188,7 @@
}
void CuttlefishConfig::set_ramdisk_image_path(
const std::string& ramdisk_image_path) {
- SetPath(kRamdiskImagePath, ramdisk_image_path);
+ (*dictionary_)[kRamdiskImagePath] = ramdisk_image_path;
}
std::string CuttlefishConfig::system_image_path() const {
@@ -203,7 +196,7 @@
}
void CuttlefishConfig::set_system_image_path(
const std::string& system_image_path) {
- SetPath(kSystemImagePath, system_image_path);
+ (*dictionary_)[kSystemImagePath] = system_image_path;
}
std::string CuttlefishConfig::cache_image_path() const {
@@ -211,14 +204,14 @@
}
void CuttlefishConfig::set_cache_image_path(
const std::string& cache_image_path) {
- SetPath(kCacheImagePath, cache_image_path);
+ (*dictionary_)[kCacheImagePath] = cache_image_path;
}
std::string CuttlefishConfig::data_image_path() const {
return (*dictionary_)[kDataImagePath].asString();
}
void CuttlefishConfig::set_data_image_path(const std::string& data_image_path) {
- SetPath(kDataImagePath, data_image_path);
+ (*dictionary_)[kDataImagePath] = data_image_path;
}
std::string CuttlefishConfig::vendor_image_path() const {
@@ -226,21 +219,21 @@
}
void CuttlefishConfig::set_vendor_image_path(
const std::string& vendor_image_path) {
- SetPath(kVendorImagePath, vendor_image_path);
+ (*dictionary_)[kVendorImagePath] = vendor_image_path;
}
std::string CuttlefishConfig::dtb_path() const {
return (*dictionary_)[kDtbPath].asString();
}
void CuttlefishConfig::set_dtb_path(const std::string& dtb_path) {
- SetPath(kDtbPath, dtb_path);
+ (*dictionary_)[kDtbPath] = dtb_path;
}
std::string CuttlefishConfig::mempath() const {
return (*dictionary_)[kMempath].asString();
}
void CuttlefishConfig::set_mempath(const std::string& mempath) {
- SetPath(kMempath, mempath);
+ (*dictionary_)[kMempath] = mempath;
}
std::string CuttlefishConfig::ivshmem_qemu_socket_path() const {
@@ -248,7 +241,7 @@
}
void CuttlefishConfig::set_ivshmem_qemu_socket_path(
const std::string& ivshmem_qemu_socket_path) {
- SetPath(kIvshmemQemuSocketPath, ivshmem_qemu_socket_path);
+ (*dictionary_)[kIvshmemQemuSocketPath] = ivshmem_qemu_socket_path;
}
std::string CuttlefishConfig::ivshmem_client_socket_path() const {
@@ -256,7 +249,7 @@
}
void CuttlefishConfig::set_ivshmem_client_socket_path(
const std::string& ivshmem_client_socket_path) {
- SetPath(kIvshmemClientSocketPath, ivshmem_client_socket_path);
+ (*dictionary_)[kIvshmemClientSocketPath] = ivshmem_client_socket_path;
}
int CuttlefishConfig::ivshmem_vector_count() const {
@@ -301,14 +294,14 @@
return (*dictionary_)[kConsolePath].asString();
}
void CuttlefishConfig::set_console_path(const std::string& console_path) {
- SetPath(kConsolePath, console_path);
+ (*dictionary_)[kConsolePath] = console_path;
}
std::string CuttlefishConfig::logcat_path() const {
return (*dictionary_)[kLogcatPath].asString();
}
void CuttlefishConfig::set_logcat_path(const std::string& logcat_path) {
- SetPath(kLogcatPath, logcat_path);
+ (*dictionary_)[kLogcatPath] = logcat_path;
}
std::string CuttlefishConfig::mobile_bridge_name() const {
@@ -379,7 +372,7 @@
}
void CuttlefishConfig::set_cuttlefish_env_path(const std::string& path) {
- SetPath(kCuttlefishEnvPath, path);
+ (*dictionary_)[kCuttlefishEnvPath] = path;
}
std::string CuttlefishConfig::cuttlefish_env_path() const {
return (*dictionary_)[kCuttlefishEnvPath].asString();
diff --git a/host/libs/config/cuttlefish_config.h b/host/libs/config/cuttlefish_config.h
index cc2abfd..9250b3e 100644
--- a/host/libs/config/cuttlefish_config.h
+++ b/host/libs/config/cuttlefish_config.h
@@ -169,7 +169,6 @@
std::unique_ptr<Json::Value> dictionary_;
void LoadFromFile(const char* file);
- void SetPath(const std::string& key, const std::string& path);
CuttlefishConfig();
CuttlefishConfig(const CuttlefishConfig&) = delete;
