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

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

Merge "make_f2fs: use -g android by default" am: 9c4ae20f 

am: 098f8a96

Change-Id: I51455b07913aa7c724d3e68671f8b9820372da53
parents 6fd017ad 098f8a96

fastboot/fs.cpp

+2 −7
Original line number Diff line number Diff line
@@ -172,13 +172,8 @@ static int generate_f2fs_image(const char* fileName, long long partSize, const s 
    mkf2fs_args.push_back("-S");

    std::string size_str = std::to_string(partSize);

    mkf2fs_args.push_back(size_str.c_str());

    mkf2fs_args.push_back("-f");

    mkf2fs_args.push_back("-O");

    mkf2fs_args.push_back("encrypt");

    mkf2fs_args.push_back("-O");

    mkf2fs_args.push_back("quota");

    mkf2fs_args.push_back("-O");

    mkf2fs_args.push_back("verity");

    mkf2fs_args.push_back("-g");

    mkf2fs_args.push_back("android");

    mkf2fs_args.push_back(fileName);

    mkf2fs_args.push_back(nullptr);

fs_mgr/fs_mgr_format.cpp

+1 −6
Original line number Diff line number Diff line
@@ -117,12 +117,7 @@ static int format_f2fs(char *fs_blkdev, uint64_t dev_sz, bool crypt_footer) 
    // clang-format off

    const char* const args[] = {

        "/system/bin/make_f2fs",

        "-d1",

        "-f",

        "-O", "encrypt",

        "-O", "quota",

        "-O", "verity",

        "-w", "4096",

        "-g", "android",

        fs_blkdev,

        size_str.c_str(),

        nullptr