commit 46542f9eccc3199b5eb789e453a123d9a3262901
author Jaegeuk Kim <jaegeuk@google.com> Wed Nov 21 12:55:19 2018 -0800
committer Jaegeuk Kim <jaegeuk@google.com> Thu Nov 22 03:42:07 2018 -0800
tree 95ef06fce467b7807c82e915b5ce1bb0b373775a
parent 66a6d8877cdaf169a24e0e7157f50b551a7b70a2

make_f2fs: use -g android by default

Bug: 119875846
Change-Id: I0c6d642d474df5cc678ced9ec4c04027ee51c6d1
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>

fastboot/fs.cpp

diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp
index fc6a16b..8c0aa6b 100644
--- a/fastboot/fs.cpp
+++ b/fastboot/fs.cpp
@@ -172,13 +172,8 @@
     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);