summaryrefslogtreecommitdiffstats
path: root/roots.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-06-22 11:37:40 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-06-22 11:37:40 +0200
commit24bb70a383d68213e8745eae9446f7b01497f447 (patch)
tree8babdeb9d275fbe2f01b50f1adf7b9c65ac8f85d /roots.cpp
parentSnap for 4848708 from 0c0a6dd512a3144cd8a710921554eb074f273905 to qt-release (diff)
parentMerge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f am: 681ae40d41 (diff)
downloadandroid_bootable_recovery-24bb70a383d68213e8745eae9446f7b01497f447.tar
android_bootable_recovery-24bb70a383d68213e8745eae9446f7b01497f447.tar.gz
android_bootable_recovery-24bb70a383d68213e8745eae9446f7b01497f447.tar.bz2
android_bootable_recovery-24bb70a383d68213e8745eae9446f7b01497f447.tar.lz
android_bootable_recovery-24bb70a383d68213e8745eae9446f7b01497f447.tar.xz
android_bootable_recovery-24bb70a383d68213e8745eae9446f7b01497f447.tar.zst
android_bootable_recovery-24bb70a383d68213e8745eae9446f7b01497f447.zip
Diffstat (limited to '')
-rw-r--r--roots.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/roots.cpp b/roots.cpp
index 3c811dfed..06a77c186 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -283,7 +283,7 @@ int format_volume(const char* volume, const char* directory) {
if (strcmp(v->fs_type, "ext4") == 0) {
static constexpr int kBlockSize = 4096;
std::vector<std::string> mke2fs_args = {
- "/sbin/mke2fs_static", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize),
+ "/system/bin/mke2fs", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize),
};
int raid_stride = v->logical_blk_size / kBlockSize;
@@ -305,13 +305,7 @@ int format_volume(const char* volume, const char* directory) {
int result = exec_cmd(mke2fs_args);
if (result == 0 && directory != nullptr) {
std::vector<std::string> e2fsdroid_args = {
- "/sbin/e2fsdroid_static",
- "-e",
- "-f",
- directory,
- "-a",
- volume,
- v->blk_device,
+ "/system/bin/e2fsdroid", "-e", "-f", directory, "-a", volume, v->blk_device,
};
result = exec_cmd(e2fsdroid_args);
}