StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "aflags: Ensure <partition>/aconfig_flags.pb exists before reading" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-18 15:27:36 +00:00
committed by Gerrit Code Review
parent ad85a2a15c bc962db1ea
commit bb4e87008f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aconfig/aconfig_device_paths/src/lib.rs
View File

@@ -30,9 +30,11 @@ fn read_partition_paths() -> Vec<PathBuf> {
.collect() .collect()
} }
/// Determine all paths that contain an aconfig protobuf file. /// Determines all paths that contain an aconfig protobuf file,
/// filtering out nonexistent partition protobuf files.
pub fn parsed_flags_proto_paths() -> Result<Vec<PathBuf>> { pub fn parsed_flags_proto_paths() -> Result<Vec<PathBuf>> {
let mut result: Vec<PathBuf> = read_partition_paths(); let mut result: Vec<PathBuf> =
read_partition_paths().into_iter().filter(|s| s.exists()).collect();
for dir in fs::read_dir("/apex")? { for dir in fs::read_dir("/apex")? {
let dir = dir?; let dir = dir?;