summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2018-06-21 00:35:04 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-06-21 00:35:04 +0200
commit8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04 (patch)
tree8babdeb9d275fbe2f01b50f1adf7b9c65ac8f85d
parentMerge "applypatch: Clean up the function comments." am: 24e1321bc3 am: d4c1045d4e (diff)
parentMerge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f (diff)
downloadandroid_bootable_recovery-8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04.tar
android_bootable_recovery-8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04.tar.gz
android_bootable_recovery-8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04.tar.bz2
android_bootable_recovery-8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04.tar.lz
android_bootable_recovery-8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04.tar.xz
android_bootable_recovery-8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04.tar.zst
android_bootable_recovery-8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04.zip
-rw-r--r--Android.mk4
-rw-r--r--roots.cpp10
-rw-r--r--updater/install.cpp8
3 files changed, 8 insertions, 14 deletions
diff --git a/Android.mk b/Android.mk
index 819ad5a44..906fcd6a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -190,8 +190,8 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_HAL_STATIC_LIBRARIES := libhealthd
LOCAL_REQUIRED_MODULES := \
- e2fsdroid_static \
- mke2fs_static \
+ e2fsdroid.recovery \
+ mke2fs.recovery \
mke2fs.conf
ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
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);
}
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;