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

aconfig: remove cache filtering by container

Browse Source 
No need for cache filtering based on container anymore. This is now
performed by build system automatically. The caches feed into storage
generation command are automatically filtered based on owning
container.

Bug: b/312444587
Test: atest aconfig.test
Change-Id: I44f3ac03d50b77a191a82ff7ed4d02766012492d
This commit is contained in:
Dennis Shen
2024-04-19 21:33:52 +00:00
parent 6f4c692948
commit 1ebcd017ae
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/aconfig/aconfig/src/commands.rs
View File

@@ -242,10 +242,7 @@ pub fn create_storage(
let parsed_flags_vec: Vec<ProtoParsedFlags> = caches
.into_iter()
.map(|mut input| input.try_parse_flags())
.collect::<Result<Vec<_>>>()?
.into_iter()
.filter(|pfs| find_unique_container(pfs) == Some(container))
.collect();
.collect::<Result<Vec<_>>>()?;
generate_storage_file(container, parsed_flags_vec.iter(), file)
}
@@ -324,14 +321,6 @@ fn find_unique_package(parsed_flags: &[ProtoParsedFlag]) -> Option<&str> {
Some(package)
}
fn find_unique_container(parsed_flags: &ProtoParsedFlags) -> Option<&str> {
let container = parsed_flags.parsed_flag.first().map(|pf| pf.container())?;
if parsed_flags.parsed_flag.iter().any(|pf| pf.container() != container) {
return None;
}
Some(container)
}
pub fn modify_parsed_flags_based_on_mode(
parsed_flags: ProtoParsedFlags,
codegen_mode: CodegenMode,