diff options
author | Jiyong Park <jiyong@google.com> | 2018-06-21 00:24:29 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-21 00:24:29 +0200 |
commit | 681ae40d4186db9f349032d07b49d770ce20dab1 (patch) | |
tree | 8babdeb9d275fbe2f01b50f1adf7b9c65ac8f85d /roots.cpp | |
parent | Merge "applypatch: Clean up the function comments." (diff) | |
parent | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" (diff) | |
download | android_bootable_recovery-681ae40d4186db9f349032d07b49d770ce20dab1.tar android_bootable_recovery-681ae40d4186db9f349032d07b49d770ce20dab1.tar.gz android_bootable_recovery-681ae40d4186db9f349032d07b49d770ce20dab1.tar.bz2 android_bootable_recovery-681ae40d4186db9f349032d07b49d770ce20dab1.tar.lz android_bootable_recovery-681ae40d4186db9f349032d07b49d770ce20dab1.tar.xz android_bootable_recovery-681ae40d4186db9f349032d07b49d770ce20dab1.tar.zst android_bootable_recovery-681ae40d4186db9f349032d07b49d770ce20dab1.zip |
Diffstat (limited to 'roots.cpp')
-rw-r--r-- | roots.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -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); } |