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

Commit 8d9b33d6 authored by Ryan Prichard's avatar Ryan Prichard
Browse files

fs_mgr: avoid vector<const T> 

A container of const T uses std::allocator<const T>, which was an
undocumented libc++ extension that has been removed.

See https://github.com/llvm/llvm-project/pull/96319.

Bug: 349681543
Test: m libfs_mgr
Change-Id: Ic7f50453f05293b7684be22393d6e5871e493983
parent 2d4d60cc

fs_mgr/fs_mgr_overlayfs_mount.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ bool fs_mgr_is_dsu_running() { 
    return android::gsi::IsGsiRunning();

    return android::gsi::IsGsiRunning();

}

}





std::vector<const std::string> OverlayMountPoints() {

std::vector<std::string> OverlayMountPoints() {

    // Never fallback to legacy cache mount point if within a DSU system,

    // Never fallback to legacy cache mount point if within a DSU system,

    // because running a DSU system implies the device supports dynamic

    // because running a DSU system implies the device supports dynamic

    // partitions, which means legacy cache mustn't be used.

    // partitions, which means legacy cache mustn't be used.

fs_mgr/fs_mgr_overlayfs_mount.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ const std::string fs_mgr_mount_point(const std::string& mount_point); 
bool OverlayfsSetupAllowed(bool verbose = false);

bool OverlayfsSetupAllowed(bool verbose = false);

bool MountScratch(const std::string& device_path, bool readonly = false);

bool MountScratch(const std::string& device_path, bool readonly = false);

bool fs_mgr_overlayfs_umount_scratch();

bool fs_mgr_overlayfs_umount_scratch();

std::vector<const std::string> OverlayMountPoints();

std::vector<std::string> OverlayMountPoints();

bool fs_mgr_overlayfs_already_mounted(const std::string& mount_point, bool overlay_only = true);

bool fs_mgr_overlayfs_already_mounted(const std::string& mount_point, bool overlay_only = true);

bool fs_mgr_wants_overlayfs(android::fs_mgr::FstabEntry* entry);

bool fs_mgr_wants_overlayfs(android::fs_mgr::FstabEntry* entry);

android::fs_mgr::Fstab fs_mgr_overlayfs_candidate_list(const android::fs_mgr::Fstab& fstab);

android::fs_mgr::Fstab fs_mgr_overlayfs_candidate_list(const android::fs_mgr::Fstab& fstab);

fs_mgr/fs_mgr_vendor_overlay.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ namespace { 




// The order of the list means the priority to show the files in the directory.

// The order of the list means the priority to show the files in the directory.

// The last one has the highest priority.

// The last one has the highest priority.

const std::vector<const std::string> kVendorOverlaySourceDirs = {

const std::vector<std::string> kVendorOverlaySourceDirs = {

        "/system/vendor_overlay/",

        "/system/vendor_overlay/",

        "/product/vendor_overlay/",

        "/product/vendor_overlay/",

};

};