commit b47c557ea28eaf7225c0799f13eb1f553c7b4e3e
author android-build-team Robot <android-build-team-robot@google.com> Wed Sep 05 03:09:53 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Sep 05 03:09:53 2018 +0000
tree f8bc98553785b0d1ab524b0aa0d62cc4e6a32662
parent 6e8075ebbbfb9fd8331b1a803df220fa61b3e25c
parent 884b1a5b0c2d34b075d8cd594e9d734722d60bbb

Snap for 4992407 from 884b1a5b0c2d34b075d8cd594e9d734722d60bbb to qt-release

Change-Id: I02de5aeb5c0420b25cde8aa71c2fbbf85f86e25c

roots.cpp

diff --git a/roots.cpp b/roots.cpp
index 06a77c1..c29771a 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -126,7 +126,7 @@
   mkdir(mount_point, 0755);  // in case it doesn't already exist
 
   if (strcmp(v->fs_type, "ext4") == 0 || strcmp(v->fs_type, "squashfs") == 0 ||
-      strcmp(v->fs_type, "vfat") == 0) {
+      strcmp(v->fs_type, "vfat") == 0 || strcmp(v->fs_type, "f2fs") == 0) {
     int result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
     if (result == -1 && fs_mgr_is_formattable(v)) {
       PLOG(ERROR) << "Failed to mount " << mount_point << "; formatting";