Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73b00733 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "aconfig: consolidate how fully qualified flag name is calculated" into main am: 5f24a209 am: a57772e2

Original change: https://android-review.googlesource.com/c/platform/build/+/2864525



Change-Id: I51daca6eb19147647fc07f8227f0dc4e1d3f6084
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d449b411 a57772e2

tools/aconfig/src/commands.rs

+12 −17
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ use crate::codegen_cpp::generate_cpp_code; 
use crate::codegen_java::generate_java_code;

use crate::codegen_rust::generate_rust_code;

use crate::protos::{

    ProtoFlagMetadata, ProtoFlagPermission, ProtoFlagState, ProtoParsedFlag, ProtoParsedFlags,

    ProtoTracepoint,

    ParsedFlagExt, ProtoFlagMetadata, ProtoFlagPermission, ProtoFlagState, ProtoParsedFlag,

    ProtoParsedFlags, ProtoTracepoint,

};



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)

    {

        let line = format!(

            "{}:{}.{}={}\n",

            "{}:{}={}\n",

            parsed_flag.namespace(),

            parsed_flag.package(),

            parsed_flag.name(),

            parsed_flag.fully_qualified_name(),

            match parsed_flag.state() {

                ProtoFlagState::ENABLED => "enabled",

                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)

    {

        let line = format!(

            "persist.device_config.{}.{}={}\n",

            parsed_flag.package(),

            parsed_flag.name(),

            "persist.device_config.{}={}\n",

            parsed_flag.fully_qualified_name(),

            match parsed_flag.state() {

                ProtoFlagState::ENABLED => "true",

                ProtoFlagState::DISABLED => "false",
@@ -286,9 +284,8 @@ pub fn dump_parsed_flags( 
        DumpFormat::Text => {

            for parsed_flag in parsed_flags.parsed_flag.into_iter() {

                let line = format!(

                    "{}.{} [{}]: {:?} + {:?}\n",

                    parsed_flag.package(),

                    parsed_flag.name(),

                    "{} [{}]: {:?} + {:?}\n",

                    parsed_flag.fully_qualified_name(),

                    parsed_flag.container(),

                    parsed_flag.permission(),

                    parsed_flag.state()
@@ -301,9 +298,8 @@ pub fn dump_parsed_flags( 
                let sources: Vec<_> =

                    parsed_flag.trace.iter().map(|tracepoint| tracepoint.source()).collect();

                let line = format!(

                    "{}.{} [{}]: {:?} + {:?} ({})\n",

                    parsed_flag.package(),

                    parsed_flag.name(),

                    "{} [{}]: {:?} + {:?} ({})\n",

                    parsed_flag.fully_qualified_name(),

                    parsed_flag.container(),

                    parsed_flag.permission(),

                    parsed_flag.state(),
@@ -322,9 +318,8 @@ pub fn dump_parsed_flags( 
        DumpFormat::Bool => {

            for parsed_flag in parsed_flags.parsed_flag.into_iter() {

                let line = format!(

                    "{}.{}={:?}\n",

                    parsed_flag.package(),

                    parsed_flag.name(),

                    "{}={:?}\n",

                    parsed_flag.fully_qualified_name(),

                    parsed_flag.state() == ProtoFlagState::ENABLED

                );

                output.extend_from_slice(line.as_bytes());

tools/aconfig/src/protos.rs

+11 −1
Original line number Diff line number Diff line
@@ -308,7 +308,17 @@ pub mod parsed_flags { 
    }



    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())

    }

}