Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59b20d65 authored by Jin Qian's avatar Jin Qian Committed by android-build-merger
Browse files

Merge "recovery: remove make_ext4fs from updater" 

am: 3f065127

Change-Id: Iaccf79dfa4fc7b85071567cd0d58d294478ea0f3
parents 4d079261 3f065127

updater/install.cpp

+2 −9
Original line number Diff line number Diff line
@@ -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,15 +283,9 @@ 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;

      LOG(ERROR) << name << ": mke2fs failed (" << status << ") on " << location;

      return StringValue("");

    }

      return StringValue(location);

    }



    const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e",   "-a", mount_point.c_str(),

                                     location.c_str(),         nullptr };