summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 000148d)
raw | patch | inline | side by side (parent: 000148d)
author | Jin Qian <jinqian@google.com> | |
Thu, 2 Nov 2017 18:58:12 +0000 (11:58 -0700) | ||
committer | Jin Qian <jinqian@google.com> | |
Fri, 3 Nov 2017 20:54:59 +0000 (13:54 -0700) |
updater/install.cpp | patch | blob | history |
diff --git a/updater/install.cpp b/updater/install.cpp
index 9425d18727482703573348975fad003b946b8f0f..b865081b493407bfcdf76354c63c04c0c48dda03 100644 (file)
--- a/updater/install.cpp
+++ b/updater/install.cpp
#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(),