summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2018-06-21 00:24:29 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-06-21 00:24:29 +0200
commit681ae40d4186db9f349032d07b49d770ce20dab1 (patch)
tree8babdeb9d275fbe2f01b50f1adf7b9c65ac8f85d /updater
parentMerge "applypatch: Clean up the function comments." (diff)
parentMerge "e2fsdroid and mke2fs are dynamic executable in recovery partition" (diff)
downloadandroid_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 'updater')
-rw-r--r--updater/install.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/updater/install.cpp b/updater/install.cpp
index dfd2dc3ae..00a05b8c9 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -511,8 +511,8 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
}
if (fs_type == "ext4") {
- const char* mke2fs_argv[] = { "/sbin/mke2fs_static", "-t", "ext4", "-b", "4096",
- location.c_str(), nullptr, nullptr };
+ const char* mke2fs_argv[] = { "/system/bin/mke2fs", "-t", "ext4", "-b", "4096",
+ location.c_str(), nullptr, nullptr };
std::string size_str;
if (size != 0) {
size_str = std::to_string(size / 4096LL);
@@ -525,8 +525,8 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
return StringValue("");
}
- const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-a", mount_point.c_str(),
- location.c_str(), nullptr };
+ const char* e2fsdroid_argv[] = { "/system/bin/e2fsdroid", "-e", "-a", mount_point.c_str(),
+ location.c_str(), nullptr };
status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));
if (status != 0) {
LOG(ERROR) << name << ": e2fsdroid failed (" << status << ") on " << location;