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

Merge "aconfig: remove cache filtering by container" into main am: 59274f816c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3049453

Change-Id: I6f8d39b20b7ba326ba61cdb8965fcf1f185155c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dennis Shen
2024-04-23 20:21:40 +00:00
committed by Automerger Merge Worker
parent fb86e10671 59274f816c
commit 400834f3dc
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 let parsed_flags_vec: Vec<ProtoParsedFlags> = caches
.into_iter() .into_iter()
.map(|mut input| input.try_parse_flags()) .map(|mut input| input.try_parse_flags())
.collect::<Result<Vec<_>>>()? .collect::<Result<Vec<_>>>()?;
.into_iter()
.filter(|pfs| find_unique_container(pfs) == Some(container))
.collect();
generate_storage_file(container, parsed_flags_vec.iter(), file) generate_storage_file(container, parsed_flags_vec.iter(), file)
} }
@@ -324,14 +321,6 @@ fn find_unique_package(parsed_flags: &[ProtoParsedFlag]) -> Option<&str> {
Some(package) 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( pub fn modify_parsed_flags_based_on_mode(
parsed_flags: ProtoParsedFlags, parsed_flags: ProtoParsedFlags,
codegen_mode: CodegenMode, codegen_mode: CodegenMode,