diff options
author | Jin Qian | 2017-11-02 13:58:12 -0500 |
---|---|---|
committer | Jin Qian | 2017-11-03 15:54:59 -0500 |
commit | 502fd1c5e82a21ecb4eace746c320dc42a77144b (patch) | |
tree | bf23c0902a7efc4153971fd520e8e377e0eef570 /updater | |
parent | 000148dbc9921ab94c2b6bfc1843710a28c0a9ab (diff) | |
download | platform-bootable-recovery-502fd1c5e82a21ecb4eace746c320dc42a77144b.tar.gz platform-bootable-recovery-502fd1c5e82a21ecb4eace746c320dc42a77144b.tar.xz platform-bootable-recovery-502fd1c5e82a21ecb4eace746c320dc42a77144b.zip |
recovery: remove make_ext4fs from updater
Bug: 64395169
Change-Id: I6f6a4f82b225435c6ad5c828e110fa135e6f7579
Diffstat (limited to 'updater')
-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 9425d187..b865081b 100644 --- a/updater/install.cpp +++ b/updater/install.cpp | |||
@@ -49,7 +49,6 @@ | |||
49 | #include <applypatch/applypatch.h> | 49 | #include <applypatch/applypatch.h> |
50 | #include <bootloader_message/bootloader_message.h> | 50 | #include <bootloader_message/bootloader_message.h> |
51 | #include <cutils/android_reboot.h> | 51 | #include <cutils/android_reboot.h> |
52 | #include <ext4_utils/make_ext4fs.h> | ||
53 | #include <ext4_utils/wipe.h> | 52 | #include <ext4_utils/wipe.h> |
54 | #include <openssl/sha.h> | 53 | #include <openssl/sha.h> |
55 | #include <selinux/label.h> | 54 | #include <selinux/label.h> |
@@ -284,14 +283,8 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt | |||
284 | 283 | ||
285 | int status = exec_cmd(mke2fs_argv[0], const_cast<char**>(mke2fs_argv)); | 284 | int status = exec_cmd(mke2fs_argv[0], const_cast<char**>(mke2fs_argv)); |
286 | if (status != 0) { | 285 | if (status != 0) { |
287 | LOG(WARNING) << name << ": mke2fs failed (" << status << ") on " << location | 286 | LOG(ERROR) << name << ": mke2fs failed (" << status << ") on " << location; |
288 | << ", falling back to make_ext4fs"; | 287 | return StringValue(""); |
289 | status = make_ext4fs(location.c_str(), size, mount_point.c_str(), sehandle); | ||
290 | if (status != 0) { | ||
291 | LOG(ERROR) << name << ": make_ext4fs failed (" << status << ") on " << location; | ||
292 | return StringValue(""); | ||
293 | } | ||
294 | return StringValue(location); | ||
295 | } | 288 | } |
296 | 289 | ||
297 | const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-a", mount_point.c_str(), | 290 | const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-a", mount_point.c_str(), |