Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec0d67d2 authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Fix build breakage on -user build" am: 8959962b am: c7b29161 am:... 

Merge "Fix build breakage on -user build" am: 8959962b am: c7b29161 am: 8e736f6c am: 37c2d6a6 am: 2525b7f0

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



Change-Id: Ie33fd782fca7a6cdcf1514bdd4ada55d0dea35c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62bdac3e 2525b7f0

fs_mgr/fs_mgr_overlayfs.cpp

+3 −3
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ bool fs_mgr_overlayfs_filesystem_available(const std::string& filesystem) { 
    return filesystems.find("\t" + filesystem + "\n") != std::string::npos;

}



const auto kLowerdirOption = "lowerdir="s;

const auto kUpperdirOption = "upperdir="s;



}  // namespace



#if ALLOW_ADBD_DISABLE_VERITY == 0  // If we are a user build, provide stubs
@@ -328,9 +331,6 @@ std::string fs_mgr_get_overlayfs_candidate(const std::string& mount_point) { 
    return "";

}



const auto kLowerdirOption = "lowerdir="s;

const auto kUpperdirOption = "upperdir="s;



static inline bool KernelSupportsUserXattrs() {

    struct utsname uts;

    uname(&uts);