diff options
| -rw-r--r-- | fsck_unshare_blocks.cpp | 3 | ||||
| -rw-r--r-- | otautil/include/otautil/roots.h | 4 | ||||
| -rw-r--r-- | otautil/roots.cpp | 8 | ||||
| -rw-r--r-- | recovery.cpp | 4 | ||||
| -rw-r--r-- | recovery_main.cpp | 3 |
5 files changed, 6 insertions, 16 deletions
diff --git a/fsck_unshare_blocks.cpp b/fsck_unshare_blocks.cpp index 0f8ffface..9dc0fd8ec 100644 --- a/fsck_unshare_blocks.cpp +++ b/fsck_unshare_blocks.cpp @@ -34,6 +34,7 @@ #include <android-base/logging.h> #include <android-base/properties.h> #include <android-base/unique_fd.h> +#include <fs_mgr/roots.h> #include "otautil/roots.h" @@ -119,7 +120,7 @@ bool do_fsck_unshare_blocks() { std::vector<std::string> partitions = { "/odm", "/oem", "/product", "/vendor" }; // Temporarily mount system so we can copy e2fsck_static. - std::string system_root = get_system_root(); + auto system_root = android::fs_mgr::GetSystemRoot(); bool mounted = ensure_path_mounted_at(system_root, "/mnt/system") != -1; partitions.push_back(system_root); diff --git a/otautil/include/otautil/roots.h b/otautil/include/otautil/roots.h index 482f3d050..2ab3f4549 100644 --- a/otautil/include/otautil/roots.h +++ b/otautil/include/otautil/roots.h @@ -53,7 +53,3 @@ int format_volume(const std::string& volume, const std::string& directory); // Ensure that all and only the volumes that packages expect to find // mounted (/tmp and /cache) are mounted. Returns 0 on success. int setup_install_mounts(); - -bool logical_partitions_mapped(); - -std::string get_system_root(); diff --git a/otautil/roots.cpp b/otautil/roots.cpp index 815d644e5..a778e05ff 100644 --- a/otautil/roots.cpp +++ b/otautil/roots.cpp @@ -275,11 +275,3 @@ int setup_install_mounts() { } return 0; } - -bool logical_partitions_mapped() { - return android::fs_mgr::LogicalPartitionsMapped(); -} - -std::string get_system_root() { - return android::fs_mgr::GetSystemRoot(); -} 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; diff --git a/recovery_main.cpp b/recovery_main.cpp index b999505fb..aba9c5d75 100644 --- a/recovery_main.cpp +++ b/recovery_main.cpp @@ -42,6 +42,7 @@ #include <android-base/unique_fd.h> #include <bootloader_message/bootloader_message.h> #include <cutils/sockets.h> +#include <fs_mgr/roots.h> #include <private/android_logger.h> /* private pmsg functions */ #include <selinux/android.h> #include <selinux/label.h> @@ -505,7 +506,7 @@ int main(int argc, char** argv) { } case Device::ENTER_FASTBOOT: - if (logical_partitions_mapped()) { + if (android::fs_mgr::LogicalPartitionsMapped()) { ui->Print("Partitions may be mounted - rebooting to enter fastboot."); Reboot("fastboot"); } else { |