commit ff957f83b08d12d3663c67335db98cba7be464b3
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 09 20:41:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 09 20:41:58 2020 +0000
tree 9e0f3aac9e456c8c8dae5d223340330a828f0827
parent 93f97df267f9cc9798cea415870c70781d7da2b2
parent 2ecb2e9f2692950d27456e57563bfc399728d7a0

Merge "Add erofs to supported fs type" am: 8571b76185 am: 2ecb2e9f26

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386043c4ef31e5f0239bd0818725e3d5791554ed

fs_mgr/fs_mgr_roots.cpp

diff --git a/fs_mgr/fs_mgr_roots.cpp b/fs_mgr/fs_mgr_roots.cpp
index 1e65587..fdaffbe 100644
--- a/fs_mgr/fs_mgr_roots.cpp
+++ b/fs_mgr/fs_mgr_roots.cpp
@@ -111,7 +111,8 @@
         return true;
     }
 
-    static const std::vector<std::string> supported_fs{"ext4", "squashfs", "vfat", "f2fs", "none"};
+    static const std::vector<std::string> supported_fs{"ext4", "squashfs", "vfat", "f2fs", "erofs",
+                                                       "none"};
     if (std::find(supported_fs.begin(), supported_fs.end(), rec->fs_type) == supported_fs.end()) {
         LERROR << "unknown fs_type \"" << rec->fs_type << "\" for " << mount_point;
         return false;