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

Commit ec0f7774 authored by Ryan Prichard's avatar Ryan Prichard
Browse files

fs_mgr: avoid std::vector<const T> 

std::vector<const T> uses std::allocator<const T>, which is an
undocumented libc++ extension to the C++ standard library. The extension
was removed in llvm.org/PR96319. Use an ordinary non-const T instead.

Bug: http://b/349681543
Bug: http://b/375478563
Test: m libfs_mgr
Flag: EXEMPT, refactor to fix build failure
Change-Id: I759526c7507824dca0e2e4f5cb2bf3c58dece1d8
parent e4acb47b

fs_mgr/fs_mgr.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2213,11 +2213,11 @@ bool fs_mgr_mount_overlayfs_fstab_entry(const FstabEntry& entry) { 


#if ALLOW_ADBD_DISABLE_VERITY == 0

    // Allowlist the mount point if user build.

    static const std::vector<const std::string> kAllowedPaths = {

    static const std::vector<std::string> kAllowedPaths = {

            "/odm",         "/odm_dlkm",   "/oem",    "/product",

            "/system_dlkm", "/system_ext", "/vendor", "/vendor_dlkm",

    };

    static const std::vector<const std::string> kAllowedPrefixes = {

    static const std::vector<std::string> kAllowedPrefixes = {

            "/mnt/product/",

            "/mnt/vendor/",

    };