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

Merge "aconfig: consolidate how fully qualified flag name is calculated" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-12-08 11:22:50 +00:00
committed by Gerrit Code Review
parent 14a82dab15 f3f20efd0c
commit 5f24a2095d
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,8 @@ use crate::codegen_cpp::generate_cpp_code;
use crate::codegen_java::generate_java_code; use crate::codegen_java::generate_java_code;
use crate::codegen_rust::generate_rust_code; use crate::codegen_rust::generate_rust_code;
use crate::protos::{ use crate::protos::{
ProtoFlagMetadata, ProtoFlagPermission, ProtoFlagState, ProtoParsedFlag, ProtoParsedFlags, ParsedFlagExt, ProtoFlagMetadata, ProtoFlagPermission, ProtoFlagState, ProtoParsedFlag,
ProtoTracepoint, ProtoParsedFlags, ProtoTracepoint,
}; };
pub struct Input { pub struct Input {
@@ -226,10 +226,9 @@ pub fn create_device_config_defaults(mut input: Input) -> Result<Vec<u8>> {
.filter(|pf| pf.permission() == ProtoFlagPermission::READ_WRITE) .filter(|pf| pf.permission() == ProtoFlagPermission::READ_WRITE)
{ {
let line = format!( let line = format!(
"{}:{}.{}={}\n", "{}:{}={}\n",
parsed_flag.namespace(), parsed_flag.namespace(),
parsed_flag.package(), parsed_flag.fully_qualified_name(),
parsed_flag.name(),
match parsed_flag.state() { match parsed_flag.state() {
ProtoFlagState::ENABLED => "enabled", ProtoFlagState::ENABLED => "enabled",
ProtoFlagState::DISABLED => "disabled", ProtoFlagState::DISABLED => "disabled",
@@ -249,9 +248,8 @@ pub fn create_device_config_sysprops(mut input: Input) -> Result<Vec<u8>> {
.filter(|pf| pf.permission() == ProtoFlagPermission::READ_WRITE) .filter(|pf| pf.permission() == ProtoFlagPermission::READ_WRITE)
{ {
let line = format!( let line = format!(
"persist.device_config.{}.{}={}\n", "persist.device_config.{}={}\n",
parsed_flag.package(), parsed_flag.fully_qualified_name(),
parsed_flag.name(),
match parsed_flag.state() { match parsed_flag.state() {
ProtoFlagState::ENABLED => "true", ProtoFlagState::ENABLED => "true",
ProtoFlagState::DISABLED => "false", ProtoFlagState::DISABLED => "false",
@@ -286,9 +284,8 @@ pub fn dump_parsed_flags(
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.fully_qualified_name(),
parsed_flag.name(),
parsed_flag.container(), parsed_flag.container(),
parsed_flag.permission(), parsed_flag.permission(),
parsed_flag.state() parsed_flag.state()
@@ -301,9 +298,8 @@ pub fn dump_parsed_flags(
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.fully_qualified_name(),
parsed_flag.name(),
parsed_flag.container(), parsed_flag.container(),
parsed_flag.permission(), parsed_flag.permission(),
parsed_flag.state(), parsed_flag.state(),
@@ -322,9 +318,8 @@ pub fn dump_parsed_flags(
DumpFormat::Bool => { DumpFormat::Bool => {
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.fully_qualified_name(),
parsed_flag.name(),
parsed_flag.state() == ProtoFlagState::ENABLED parsed_flag.state() == ProtoFlagState::ENABLED
); );
output.extend_from_slice(line.as_bytes()); output.extend_from_slice(line.as_bytes());

12
tools/aconfig/src/protos.rs
View File

@@ -308,7 +308,17 @@ pub mod parsed_flags {
} }
fn create_sorting_key(pf: &ProtoParsedFlag) -> String { fn create_sorting_key(pf: &ProtoParsedFlag) -> String {
format!("{}.{}", pf.package(), pf.name()) pf.fully_qualified_name()
}
}
pub trait ParsedFlagExt {
fn fully_qualified_name(&self) -> String;
}
impl ParsedFlagExt for ProtoParsedFlag {
fn fully_qualified_name(&self) -> String {
format!("{}.{}", self.package(), self.name())
} }
} }