From 8d9b33d64917a05e3342a9b7faef2156afdf8604 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Thu, 27 Jun 2024 21:51:49 -0700 Subject: [PATCH] fs_mgr: avoid vector A container of const T uses std::allocator, 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 --- fs_mgr/fs_mgr_overlayfs_mount.cpp | 2 +- fs_mgr/fs_mgr_overlayfs_mount.h | 2 +- fs_mgr/fs_mgr_vendor_overlay.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs_mgr/fs_mgr_overlayfs_mount.cpp b/fs_mgr/fs_mgr_overlayfs_mount.cpp index bd0fcfd98..b63b9e7aa 100644 --- a/fs_mgr/fs_mgr_overlayfs_mount.cpp +++ b/fs_mgr/fs_mgr_overlayfs_mount.cpp @@ -74,7 +74,7 @@ bool fs_mgr_is_dsu_running() { return android::gsi::IsGsiRunning(); } -std::vector OverlayMountPoints() { +std::vector OverlayMountPoints() { // Never fallback to legacy cache mount point if within a DSU system, // because running a DSU system implies the device supports dynamic // partitions, which means legacy cache mustn't be used. diff --git a/fs_mgr/fs_mgr_overlayfs_mount.h b/fs_mgr/fs_mgr_overlayfs_mount.h index 98b9007b5..f941ab1d6 100644 --- a/fs_mgr/fs_mgr_overlayfs_mount.h +++ b/fs_mgr/fs_mgr_overlayfs_mount.h @@ -54,7 +54,7 @@ const std::string fs_mgr_mount_point(const std::string& mount_point); bool OverlayfsSetupAllowed(bool verbose = false); bool MountScratch(const std::string& device_path, bool readonly = false); bool fs_mgr_overlayfs_umount_scratch(); -std::vector OverlayMountPoints(); +std::vector OverlayMountPoints(); 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); android::fs_mgr::Fstab fs_mgr_overlayfs_candidate_list(const android::fs_mgr::Fstab& fstab); diff --git a/fs_mgr/fs_mgr_vendor_overlay.cpp b/fs_mgr/fs_mgr_vendor_overlay.cpp index 6b742e55e..668728384 100644 --- a/fs_mgr/fs_mgr_vendor_overlay.cpp +++ b/fs_mgr/fs_mgr_vendor_overlay.cpp @@ -36,7 +36,7 @@ namespace { // The order of the list means the priority to show the files in the directory. // The last one has the highest priority. -const std::vector kVendorOverlaySourceDirs = { +const std::vector kVendorOverlaySourceDirs = { "/system/vendor_overlay/", "/product/vendor_overlay/", };