summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2018-11-30 23:31:35 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-11-30 23:31:35 +0100
commitfe00ae099cb02fccef274afea6a55245e1d98cd3 (patch)
tree3698dae3205a75a789bd25571404a51c90c631c7 /recovery.cpp
parentMerge "Update for long long -> off64_t for fstab.length" (diff)
parentMerge "SYSTEM_ROOT -> get_system_root" (diff)
downloadandroid_bootable_recovery-fe00ae099cb02fccef274afea6a55245e1d98cd3.tar
android_bootable_recovery-fe00ae099cb02fccef274afea6a55245e1d98cd3.tar.gz
android_bootable_recovery-fe00ae099cb02fccef274afea6a55245e1d98cd3.tar.bz2
android_bootable_recovery-fe00ae099cb02fccef274afea6a55245e1d98cd3.tar.lz
android_bootable_recovery-fe00ae099cb02fccef274afea6a55245e1d98cd3.tar.xz
android_bootable_recovery-fe00ae099cb02fccef274afea6a55245e1d98cd3.tar.zst
android_bootable_recovery-fe00ae099cb02fccef274afea6a55245e1d98cd3.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/recovery.cpp b/recovery.cpp
index e17526a95..7e1fa43a6 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -78,7 +78,6 @@ static constexpr const char* CACHE_ROOT = "/cache";
static constexpr const char* DATA_ROOT = "/data";
static constexpr const char* METADATA_ROOT = "/metadata";
static constexpr const char* SDCARD_ROOT = "/sdcard";
-static constexpr const char* SYSTEM_ROOT = "/system";
// We define RECOVERY_API_VERSION in Android.mk, which will be picked up by build system and packed
// into target_files.zip. Assert the version defined in code and in Android.mk are consistent.
@@ -837,14 +836,8 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
}
case Device::MOUNT_SYSTEM:
// the system partition is mounted at /mnt/system
- if (volume_for_mount_point(SYSTEM_ROOT) == nullptr) {
- if (ensure_path_mounted_at("/", "/mnt/system") != -1) {
- ui->Print("Mounted /system.\n");
- }
- } else {
- if (ensure_path_mounted_at(SYSTEM_ROOT, "/mnt/system") != -1) {
- ui->Print("Mounted /system.\n");
- }
+ if (ensure_path_mounted_at(get_system_root().c_str(), "/mnt/system") != -1) {
+ ui->Print("Mounted /system.\n");
}
break;