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

Commit 36e4f3fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "aconfig-prepare-for-proto-structs" am: a99ac90e 

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



Change-Id: I11dc893158f85eb104ac8085714079c5ca3ad6ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e3d0523 a99ac90e

tools/aconfig/src/protos.rs

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


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

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

mod auto_generated {

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



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

    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;



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

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



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

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



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

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

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

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



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

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

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

}



// ---- When building with 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"));



#[cfg(feature = "cargo")]

    pub use aconfig::Flag_declaration as ProtoFlagDeclaration;



#[cfg(feature = "cargo")]

    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;



#[cfg(feature = "cargo")]

    pub use aconfig::Flag_state as ProtoFlagState;



#[cfg(feature = "cargo")]

pub use aconfig::Parsed_flags as ProtoParsedFlags;



#[cfg(feature = "cargo")]

    pub use aconfig::Flag_value as ProtoFlagValue;

    pub use aconfig::Flag_values as ProtoFlagValues;

    pub use aconfig::Parsed_flag as ProtoParsedFlag;



#[cfg(feature = "cargo")]

    pub use aconfig::Parsed_flags as ProtoParsedFlags;

    pub use aconfig::Tracepoint as ProtoTracepoint;

}



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

pub use auto_generated::*;



use anyhow::Result;



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

tools/aconfig/src/test.rs

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ pub mod test_utils { 
                    reader: Box::new(include_bytes!("../tests/first.values").as_slice()),

                },

                Input {

                    source: Source::File("tests/test.aconfig".to_string()),

                    source: Source::File("tests/second.values".to_string()),

                    reader: Box::new(include_bytes!("../tests/second.values").as_slice()),

                },

            ],