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

aconfig: add namespace field to flag_declaration and parsed_flag

Browse Source 
Add a new field to the proto messages flag_declaration and parsed_flag.

The new field will be used verbatim as a parameter when calling
DeviceConfig.getBoolean to read the value of a READ_WRITE flag. See the
DeviceConfig API for more info.

Note: not to be confused with the old namespace field, which has been
renamed to package.

Bug: 285211724
Test: atest aconfig.test
Change-Id: I2181be7b5e98fc334e5277fb5f7e386f1fe0b550
This commit is contained in:
Mårten Kongstad
2023-06-07 16:29:25 +02:00
parent fbd71e2773
commit 066575b95f
12 changed files with 144 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/aconfig/src/codegen_rust.rs
View File

@@ -20,11 +20,13 @@ use tinytemplate::TinyTemplate;
use crate::aconfig::{FlagState, Permission};
use crate::cache::{Cache, Item};
use crate::codegen;
use crate::commands::OutputFile;
pub fn generate_rust_code(cache: &Cache) -> Result<OutputFile> {
let package = cache.package();
let parsed_flags: Vec<TemplateParsedFlag> = cache.iter().map(|item| item.into()).collect();
let parsed_flags: Vec<TemplateParsedFlag> =
cache.iter().map(|item| TemplateParsedFlag::new(package, item)).collect();
let context = TemplateContext {
package: package.to_string(),
parsed_flags,
@@ -47,6 +49,8 @@ struct TemplateContext {
#[derive(Serialize)]
struct TemplateParsedFlag {
pub name: String,
pub device_config_namespace: String,
pub device_config_flag: String,
// TinyTemplate's conditionals are limited to single <bool> expressions; list all options here
// Invariant: exactly one of these fields will be true
@@ -55,11 +59,14 @@ struct TemplateParsedFlag {
pub is_read_write: bool,
}
impl From<&Item> for TemplateParsedFlag {
impl TemplateParsedFlag {
#[allow(clippy::nonminimal_bool)]
fn from(item: &Item) -> Self {
fn new(package: &str, item: &Item) -> Self {
let template = TemplateParsedFlag {
name: item.name.clone(),
device_config_namespace: item.namespace.to_string(),
device_config_flag: codegen::create_device_config_ident(package, &item.name)
.expect("values checked at cache creation time"),
is_read_only_enabled: item.permission == Permission::ReadOnly
&& item.state == FlagState::Enabled,
is_read_only_disabled: item.permission == Permission::ReadOnly
@@ -101,7 +108,7 @@ pub const fn r#disabled_ro() -> bool {
#[inline(always)]
pub fn r#disabled_rw() -> bool {
flags_rust::GetServerConfigurableFlag("com.android.aconfig.test", "disabled_rw", "false") == "true"
flags_rust::GetServerConfigurableFlag("aconfig_test", "com.android.aconfig.test.disabled_rw", "false") == "true"
}
#[inline(always)]
@@ -111,7 +118,7 @@ pub const fn r#enabled_ro() -> bool {
#[inline(always)]
pub fn r#enabled_rw() -> bool {
flags_rust::GetServerConfigurableFlag("com.android.aconfig.test", "enabled_rw", "false") == "true"
flags_rust::GetServerConfigurableFlag("aconfig_test", "com.android.aconfig.test.enabled_rw", "false") == "true"
}
}