commit 349d7052b8f39a72c268af5b1f619abcfbda37c1
author Jaegeuk Kim <jaegeuk@google.com> Tue Nov 27 17:26:01 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 27 17:26:01 2018 -0800
tree a821bca517086da3745acb60070157650925f790
parent a2193c31c531aa5c48c8e600869c45609abd9e87
parent 6d43d2be432241b2d963829cfefaeb610b2a5948

Merge "make_f2fs: use -g android by default" am: 4cd38430d7 am: f8c230a072
am: 6d43d2be43

Change-Id: Ieb3dc4d30c279ea835f8b18f058dbf118b24fb80

roots.cpp

diff --git a/roots.cpp b/roots.cpp
index dc34784..4fcd6fe 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -344,12 +344,7 @@
   // clang-format off
   std::vector<std::string> make_f2fs_cmd = {
     cmd,
-    "-d1",
-    "-f",
-    "-O", "encrypt",
-    "-O", "quota",
-    "-O", "verity",
-    "-w", std::to_string(kSectorSize),
+    "-g", "android",
     v->blk_device,
   };
   // clang-format on

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index deb7a2b..ccde409 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -484,11 +484,7 @@
 
     const char* f2fs_path = "/sbin/mkfs.f2fs";
     const char* f2fs_argv[] = { "mkfs.f2fs",
-                                "-d1",
-                                "-f",
-                                "-O", "encrypt",
-                                "-O", "quota",
-                                "-O", "verity",
+                                "-g", "android",
                                 "-w", "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),