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

Commit fc9c87b2 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by android-build-merger
Browse files

Merge "make_f2fs: specify sector size for target image size and missing options"

am: e21b764e

Change-Id: If582b09ea80eb21c581a7a2b9099138b4c9dc157
parents 081e7f5e e21b764e
Loading
Loading
Loading
Loading
+12 −1
Original line number Diff line number Diff line
@@ -114,8 +114,19 @@ static int format_f2fs(char *fs_blkdev, uint64_t dev_sz, bool crypt_footer)
    }

    std::string size_str = std::to_string(dev_sz / 4096);
    // clang-format off
    const char* const args[] = {
        "/system/bin/make_f2fs", "-f", "-O", "encrypt", fs_blkdev, size_str.c_str(), nullptr};
        "/system/bin/make_f2fs",
        "-d1",
        "-f",
        "-O", "encrypt",
        "-O", "quota",
        "-w", "4096",
        fs_blkdev,
        size_str.c_str(),
        nullptr
    };
    // clang-format on

    return android_fork_execvp_ext(arraysize(args), const_cast<char**>(args), NULL, true,
                                   LOG_KLOG, true, nullptr, nullptr, 0);