Merge "fs_mgr: avoid std::vector<const T>" into main am: d5c75fd591

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

Change-Id: Ibae891c5f377aa01f8e583f48baa30d49712a702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-10-30 02:41:54 +00:00 committed by Automerger Merge Worker
commit a26cb93702

View file

@ -2215,11 +2215,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/",
};