diff options
| author | Jin Qian <jinqian@google.com> | 2017-11-04 00:26:23 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-04 00:26:23 +0100 |
| commit | 9a631d276444d9a6b37548a331fae66044dc0b1e (patch) | |
| tree | c6c6e1bea7e249b6d7a14a35aa690ecf959a8dd0 | |
| parent | Merge "recovery: fix library dependency" am: 0da645fefa (diff) | |
| parent | Merge "recovery: remove make_ext4fs from updater" (diff) | |
| download | android_bootable_recovery-9a631d276444d9a6b37548a331fae66044dc0b1e.tar android_bootable_recovery-9a631d276444d9a6b37548a331fae66044dc0b1e.tar.gz android_bootable_recovery-9a631d276444d9a6b37548a331fae66044dc0b1e.tar.bz2 android_bootable_recovery-9a631d276444d9a6b37548a331fae66044dc0b1e.tar.lz android_bootable_recovery-9a631d276444d9a6b37548a331fae66044dc0b1e.tar.xz android_bootable_recovery-9a631d276444d9a6b37548a331fae66044dc0b1e.tar.zst android_bootable_recovery-9a631d276444d9a6b37548a331fae66044dc0b1e.zip | |
| -rw-r--r-- | updater/install.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index 9425d1872..b865081b4 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -49,7 +49,6 @@ #include <applypatch/applypatch.h> #include <bootloader_message/bootloader_message.h> #include <cutils/android_reboot.h> -#include <ext4_utils/make_ext4fs.h> #include <ext4_utils/wipe.h> #include <openssl/sha.h> #include <selinux/label.h> @@ -284,14 +283,8 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt int status = exec_cmd(mke2fs_argv[0], const_cast<char**>(mke2fs_argv)); if (status != 0) { - LOG(WARNING) << name << ": mke2fs failed (" << status << ") on " << location - << ", falling back to make_ext4fs"; - status = make_ext4fs(location.c_str(), size, mount_point.c_str(), sehandle); - if (status != 0) { - LOG(ERROR) << name << ": make_ext4fs failed (" << status << ") on " << location; - return StringValue(""); - } - return StringValue(location); + LOG(ERROR) << name << ": mke2fs failed (" << status << ") on " << location; + return StringValue(""); } const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-a", mount_point.c_str(), |