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

Commit f9422526 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

aconfig: reduce number of #[cfg(feature = "cargo")] uses 

Group statements with identical #[cfg(feature = "cargo")] attributes in
the same block. This reduces repetition and makes the code easier to
read and less error prone.

Bug: 284779868
Test: atest aconfig.test
Change-Id: Iebdcd20e7cd22cb641424a1af594f5c9ac57b623
parent 1cda03b4

tools/aconfig/src/protos.rs

+28 −53
Original line number Original line Diff line number Diff line
@@ -28,64 +28,39 @@ 




// ---- When building with the Android tool-chain ----

// ---- When building with the Android tool-chain ----

#[cfg(not(feature = "cargo"))]

#[cfg(not(feature = "cargo"))]

mod auto_generated {

    pub use aconfig_protos::aconfig::Flag_declaration as ProtoFlagDeclaration;

    pub use aconfig_protos::aconfig::Flag_declaration as ProtoFlagDeclaration;



#[cfg(not(feature = "cargo"))]

    pub use aconfig_protos::aconfig::Flag_declarations as ProtoFlagDeclarations;

    pub use aconfig_protos::aconfig::Flag_declarations as ProtoFlagDeclarations;



#[cfg(not(feature = "cargo"))]

pub use aconfig_protos::aconfig::Flag_value as ProtoFlagValue;



#[cfg(not(feature = "cargo"))]

pub use aconfig_protos::aconfig::Flag_values as ProtoFlagValues;



#[cfg(not(feature = "cargo"))]

    pub use aconfig_protos::aconfig::Flag_permission as ProtoFlagPermission;

    pub use aconfig_protos::aconfig::Flag_permission as ProtoFlagPermission;



#[cfg(not(feature = "cargo"))]

    pub use aconfig_protos::aconfig::Flag_state as ProtoFlagState;

    pub use aconfig_protos::aconfig::Flag_state as ProtoFlagState;



    pub use aconfig_protos::aconfig::Flag_value as ProtoFlagValue;

#[cfg(not(feature = "cargo"))]

    pub use aconfig_protos::aconfig::Flag_values as ProtoFlagValues;

pub use aconfig_protos::aconfig::Parsed_flags as ProtoParsedFlags;



#[cfg(not(feature = "cargo"))]

    pub use aconfig_protos::aconfig::Parsed_flag as ProtoParsedFlag;

    pub use aconfig_protos::aconfig::Parsed_flag as ProtoParsedFlag;



    pub use aconfig_protos::aconfig::Parsed_flags as ProtoParsedFlags;

#[cfg(not(feature = "cargo"))]

    pub use aconfig_protos::aconfig::Tracepoint as ProtoTracepoint;

    pub use aconfig_protos::aconfig::Tracepoint as ProtoTracepoint;

}





// ---- When building with cargo ----

// ---- When building with cargo ----

#[cfg(feature = "cargo")]

#[cfg(feature = "cargo")]

mod auto_generated {

    // include! statements should be avoided (because they import file contents verbatim), but

    // because this is only used during local development, and only if using cargo instead of the

    // Android tool-chain, we allow it

    include!(concat!(env!("OUT_DIR"), "/aconfig_proto/mod.rs"));

    include!(concat!(env!("OUT_DIR"), "/aconfig_proto/mod.rs"));



#[cfg(feature = "cargo")]

    pub use aconfig::Flag_declaration as ProtoFlagDeclaration;

    pub use aconfig::Flag_declaration as ProtoFlagDeclaration;



#[cfg(feature = "cargo")]

    pub use aconfig::Flag_declarations as ProtoFlagDeclarations;

    pub use aconfig::Flag_declarations as ProtoFlagDeclarations;



#[cfg(feature = "cargo")]

pub use aconfig::Flag_value as ProtoFlagValue;



#[cfg(feature = "cargo")]

pub use aconfig::Flag_values as ProtoFlagValues;



#[cfg(feature = "cargo")]

    pub use aconfig::Flag_permission as ProtoFlagPermission;

    pub use aconfig::Flag_permission as ProtoFlagPermission;



#[cfg(feature = "cargo")]

    pub use aconfig::Flag_state as ProtoFlagState;

    pub use aconfig::Flag_state as ProtoFlagState;



    pub use aconfig::Flag_value as ProtoFlagValue;

#[cfg(feature = "cargo")]

    pub use aconfig::Flag_values as ProtoFlagValues;

pub use aconfig::Parsed_flags as ProtoParsedFlags;



#[cfg(feature = "cargo")]

    pub use aconfig::Parsed_flag as ProtoParsedFlag;

    pub use aconfig::Parsed_flag as ProtoParsedFlag;



    pub use aconfig::Parsed_flags as ProtoParsedFlags;

#[cfg(feature = "cargo")]

    pub use aconfig::Tracepoint as ProtoTracepoint;

    pub use aconfig::Tracepoint as ProtoTracepoint;

}





// ---- Common for both the Android tool-chain and cargo ----

// ---- Common for both the Android tool-chain and cargo ----

pub use auto_generated::*;



use anyhow::Result;

use anyhow::Result;





pub fn try_from_text_proto<T>(s: &str) -> Result<T>

pub fn try_from_text_proto<T>(s: &str) -> Result<T>