make_f2fs: use -g android by default

Bug: 119875846
Change-Id: I0c6d642d474df5cc678ced9ec4c04027ee51c6d1
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
This commit is contained in:
Jaegeuk Kim 2018-11-21 12:55:19 -08:00
parent 66a6d8877c
commit 46542f9ecc
2 changed files with 3 additions and 13 deletions

View file

@ -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);

View file

@ -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