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

Merge changes from topic "aconfig-prepare-for-proto-structs"

Browse Source 
* changes:
  aconfig: fix incorrect source path in test cache
  aconfig: reduce number of #[cfg(feature = "cargo")] uses
This commit is contained in:
Treehugger Robot
2023-06-19 10:43:34 +00:00
committed by Gerrit Code Review
parent 770bfc34e3 0cd8092376
commit a99ac90eb5
2 changed files with 29 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"))]
pub use aconfig_protos::aconfig::Flag_declaration as ProtoFlagDeclaration; 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;
pub use aconfig_protos::aconfig::Flag_declarations as ProtoFlagDeclarations; pub use aconfig_protos::aconfig::Flag_permission as ProtoFlagPermission;
pub use aconfig_protos::aconfig::Flag_state as ProtoFlagState;
#[cfg(not(feature = "cargo"))] pub use aconfig_protos::aconfig::Flag_value as ProtoFlagValue;
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::Flag_values as ProtoFlagValues; pub use aconfig_protos::aconfig::Tracepoint as ProtoTracepoint;
}
#[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::Parsed_flag as ProtoParsedFlag;
#[cfg(not(feature = "cargo"))]
pub use aconfig_protos::aconfig::Tracepoint as ProtoTracepoint;
// ---- When building with cargo ---- // ---- When building with cargo ----
#[cfg(feature = "cargo")] #[cfg(feature = "cargo")]
include!(concat!(env!("OUT_DIR"), "/aconfig_proto/mod.rs")); mod auto_generated {
// include! statements should be avoided (because they import file contents verbatim), but
#[cfg(feature = "cargo")] // because this is only used during local development, and only if using cargo instead of the
pub use aconfig::Flag_declaration as ProtoFlagDeclaration; // 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;
pub use aconfig::Flag_declarations as ProtoFlagDeclarations; pub use aconfig::Flag_declarations as ProtoFlagDeclarations;
pub use aconfig::Flag_permission as ProtoFlagPermission;
#[cfg(feature = "cargo")] pub use aconfig::Flag_state as ProtoFlagState;
pub use aconfig::Flag_value as ProtoFlagValue; pub use aconfig::Flag_value as ProtoFlagValue;
pub use aconfig::Flag_values as ProtoFlagValues;
#[cfg(feature = "cargo")] pub use aconfig::Parsed_flag as ProtoParsedFlag;
pub use aconfig::Flag_values as ProtoFlagValues; pub use aconfig::Parsed_flags as ProtoParsedFlags;
pub use aconfig::Tracepoint as ProtoTracepoint;
#[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::Parsed_flag as ProtoParsedFlag;
#[cfg(feature = "cargo")]
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>

2
tools/aconfig/src/test.rs
View File

@@ -33,7 +33,7 @@ pub mod test_utils {
reader: Box::new(include_bytes!("../tests/first.values").as_slice()), reader: Box::new(include_bytes!("../tests/first.values").as_slice()),
}, },
Input { 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()), reader: Box::new(include_bytes!("../tests/second.values").as_slice()),
}, },
], ],