summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-05-11 02:40:31 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-05-11 02:40:31 +0200
commitc53856dca7d231e325df8ad5642c14ca0e676876 (patch)
treea95adea292d94af550e1a1c8c0ed1c036d63f340 /recovery.cpp
parent[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." (diff)
parentMerge "roots: Remove get_system_root and logical_partitions_mapped." (diff)
downloadandroid_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.gz
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.bz2
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.lz
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.xz
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.tar.zst
android_bootable_recovery-c53856dca7d231e325df8ad5642c14ca0e676876.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp
index dbac3e01a..20e5a1be3 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -41,6 +41,7 @@
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <cutils/properties.h> /* for property_list */
+#include <fs_mgr/roots.h>
#include <healthhalutils/HealthHalUtils.h>
#include <ziparchive/zip_archive.h>
@@ -437,8 +438,7 @@ static Device::BuiltinAction PromptAndWait(Device* device, InstallResult status)
break;
}
case Device::MOUNT_SYSTEM:
- // the system partition is mounted at /mnt/system
- if (ensure_path_mounted_at(get_system_root(), "/mnt/system") != -1) {
+ if (ensure_path_mounted_at(android::fs_mgr::GetSystemRoot(), "/mnt/system") != -1) {
ui->Print("Mounted /system.\n");
}
break;