ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs_mgr: avoid vector<const T>

Browse source 
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
This commit is contained in:
Ryan Prichard 2024-06-27 21:51:49 -07:00
parent 2d4d60cccb
commit 8d9b33d649
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/fs_mgr_overlayfs_mount.cpp
View file

@ -74,7 +74,7 @@ bool fs_mgr_is_dsu_running() {
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,
// because running a DSU system implies the device supports dynamic
// partitions, which means legacy cache mustn't be used.

2
fs_mgr/fs_mgr_overlayfs_mount.h
View file

@ -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<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_wants_overlayfs(android::fs_mgr::FstabEntry* entry);
android::fs_mgr::Fstab fs_mgr_overlayfs_candidate_list(const android::fs_mgr::Fstab& fstab);

2
fs_mgr/fs_mgr_vendor_overlay.cpp
View file

@ -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<const std::string> kVendorOverlaySourceDirs = {
const std::vector<std::string> kVendorOverlaySourceDirs = {
"/system/vendor_overlay/",
"/product/vendor_overlay/",
};