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

Merge "aconfig: separate package name and flag name using dot" into main am: 2ee29fdf7f am: fb80ce539e

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

Change-Id: I4ea92a9765ca130f9ece124169e0fa99ad134732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-22 16:24:35 +00:00
committed by Automerger Merge Worker
parent 64b88c846d fb80ce539e
commit 3bc2798a34
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,7 +260,7 @@ pub fn dump_parsed_flags(mut input: Vec<Input>, format: DumpFormat) -> Result<Ve
DumpFormat::Text => { DumpFormat::Text => {
for parsed_flag in parsed_flags.parsed_flag.into_iter() { for parsed_flag in parsed_flags.parsed_flag.into_iter() {
let line = format!( let line = format!(
"{}/{}: {:?} + {:?}\n", "{}.{}: {:?} + {:?}\n",
parsed_flag.package(), parsed_flag.package(),
parsed_flag.name(), parsed_flag.name(),
parsed_flag.permission(), parsed_flag.permission(),
@@ -274,7 +274,7 @@ pub fn dump_parsed_flags(mut input: Vec<Input>, format: DumpFormat) -> Result<Ve
let sources: Vec<_> = let sources: Vec<_> =
parsed_flag.trace.iter().map(|tracepoint| tracepoint.source()).collect(); parsed_flag.trace.iter().map(|tracepoint| tracepoint.source()).collect();
let line = format!( let line = format!(
"{}/{}: {:?} + {:?} ({})\n", "{}.{}: {:?} + {:?} ({})\n",
parsed_flag.package(), parsed_flag.package(),
parsed_flag.name(), parsed_flag.name(),
parsed_flag.permission(), parsed_flag.permission(),
@@ -449,7 +449,7 @@ mod tests {
let input = parse_test_flags_as_input(); let input = parse_test_flags_as_input();
let bytes = dump_parsed_flags(vec![input], DumpFormat::Text).unwrap(); let bytes = dump_parsed_flags(vec![input], DumpFormat::Text).unwrap();
let text = std::str::from_utf8(&bytes).unwrap(); let text = std::str::from_utf8(&bytes).unwrap();
assert!(text.contains("com.android.aconfig.test/disabled_ro: READ_ONLY + DISABLED")); assert!(text.contains("com.android.aconfig.test.disabled_ro: READ_ONLY + DISABLED"));
} }
#[test] #[test]