commit 57845b8ba6a61f98c9e0289f9c21d75a002e148c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 01 15:44:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 01 15:44:30 2018 +0000
tree 26c449a09c02d93d2663821b409f24f23a3d5769
parent 4290c0f9e9a3f5346b6f44bed546da94d750656f
parent 977c04236a17fc1a3d0e35917582dcc90d0b23e7

Merge "Make fs_mgr_access() available to user build"

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 34e24f8..f06b819 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -55,6 +55,13 @@
 using namespace android::dm;
 using namespace android::fs_mgr;
 
+static bool fs_mgr_access(const std::string& path) {
+    auto save_errno = errno;
+    auto ret = access(path.c_str(), F_OK) == 0;
+    errno = save_errno;
+    return ret;
+}
+
 #if ALLOW_ADBD_DISABLE_VERITY == 0  // If we are a user build, provide stubs
 
 bool fs_mgr_overlayfs_mount_all(fstab*) {
@@ -221,13 +228,6 @@
     return "/system";
 }
 
-bool fs_mgr_access(const std::string& path) {
-    auto save_errno = errno;
-    auto ret = access(path.c_str(), F_OK) == 0;
-    errno = save_errno;
-    return ret;
-}
-
 bool fs_mgr_rw_access(const std::string& path) {
     if (path.empty()) return false;
     auto save_errno = errno;