From 46542f9eccc3199b5eb789e453a123d9a3262901 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Wed, 21 Nov 2018 12:55:19 -0800 Subject: [PATCH] make_f2fs: use -g android by default Bug: 119875846 Change-Id: I0c6d642d474df5cc678ced9ec4c04027ee51c6d1 Signed-off-by: Jaegeuk Kim --- fastboot/fs.cpp | 9 ++------- fs_mgr/fs_mgr_format.cpp | 7 +------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp index fc6a16bb2..8c0aa6bf4 100644 --- a/fastboot/fs.cpp +++ b/fastboot/fs.cpp @@ -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); diff --git a/fs_mgr/fs_mgr_format.cpp b/fs_mgr/fs_mgr_format.cpp index 845cca9dc..098366324 100644 --- a/fs_mgr/fs_mgr_format.cpp +++ b/fs_mgr/fs_mgr_format.cpp @@ -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