commit 31d51b459c9e5593245a5d247e1bae4415e317a8
author Mark Salyzyn <salyzyn@google.com> Wed Nov 28 19:41:02 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 28 19:41:02 2018 -0800
tree 853b0f2c7681c7716202f24aa2b40d0cea1eb022
parent 122e8ff6372e5792d79de276e39439d2a0f33056
parent 5ff175e116e0da37211604d525e1b0b3ff73b145

Merge "fs_mgr: skip fs_mgr_overlayfs_required_devices w/o overlayfs in kernel"
am: cbc4116352

Change-Id: Ibec79fbb7e49a3e869f85e2d13c95e870f76d829

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 23e9c51..bef46e1 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -790,6 +790,8 @@
 }
 
 std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab) {
+    if (fs_mgr_overlayfs_valid() == OverlayfsValidResult::kNotSupported) return {};
+
     if (fs_mgr_get_entry_for_mount_point(const_cast<struct fstab*>(fstab), kScratchMountPoint)) {
         return {};
     }