Merge "Make fs_mgr_access() available to user build" (8da39ef6) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_overlayfs.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -55,6 +55,13 @@ using namespace std::literals;
		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 @@ const char* fs_mgr_mount_point(const char* mount_point) {
		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;