aconfig: add namespace field to flag_declaration and parsed_flag
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
diff --git a/tools/aconfig/src/codegen_cpp.rs b/tools/aconfig/src/codegen_cpp.rs
index 65a1de1..65f95de 100644
--- a/tools/aconfig/src/codegen_cpp.rs
+++ b/tools/aconfig/src/codegen_cpp.rs
@@ -24,14 +24,20 @@
use crate::commands::OutputFile;
pub fn generate_cpp_code(cache: &Cache) -> Result<OutputFile> {
- let class_elements: Vec<ClassElement> = cache.iter().map(create_class_element).collect();
+ let package = cache.package();
+ let class_elements: Vec<ClassElement> =
+ cache.iter().map(|item| create_class_element(package, item)).collect();
let readwrite = class_elements.iter().any(|item| item.readwrite);
- let package = cache.package().to_string();
let header = package.replace('.', "_");
let cpp_namespace = package.replace('.', "::");
ensure!(codegen::is_valid_name_ident(&header));
- let context =
- Context { header: header.clone(), cpp_namespace, package, readwrite, class_elements };
+ let context = Context {
+ header: header.clone(),
+ cpp_namespace,
+ package: package.to_string(),
+ readwrite,
+ class_elements,
+ };
let mut template = TinyTemplate::new();
template.add_template("cpp_code_gen", include_str!("../templates/cpp.template"))?;
let contents = template.render("cpp_code_gen", &context)?;
@@ -53,9 +59,11 @@
pub readwrite: bool,
pub default_value: String,
pub flag_name: String,
+ pub device_config_namespace: String,
+ pub device_config_flag: String,
}
-fn create_class_element(item: &Item) -> ClassElement {
+fn create_class_element(package: &str, item: &Item) -> ClassElement {
ClassElement {
readwrite: item.permission == Permission::ReadWrite,
default_value: if item.state == FlagState::Enabled {
@@ -64,6 +72,9 @@
"false".to_string()
},
flag_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"),
}
}
@@ -83,6 +94,7 @@
Source::File("aconfig_one.txt".to_string()),
FlagDeclaration {
name: "my_flag_one".to_string(),
+ namespace: "ns".to_string(),
description: "buildtime disable".to_string(),
},
)
@@ -101,6 +113,7 @@
Source::File("aconfig_two.txt".to_string()),
FlagDeclaration {
name: "my_flag_two".to_string(),
+ namespace: "ns".to_string(),
description: "buildtime enable".to_string(),
},
)
@@ -155,6 +168,7 @@
Source::File("aconfig_one.txt".to_string()),
FlagDeclaration {
name: "my_flag_one".to_string(),
+ namespace: "ns".to_string(),
description: "buildtime disable".to_string(),
},
)
@@ -163,6 +177,7 @@
Source::File("aconfig_two.txt".to_string()),
FlagDeclaration {
name: "my_flag_two".to_string(),
+ namespace: "ns".to_string(),
description: "runtime enable".to_string(),
},
)
@@ -190,8 +205,8 @@
public:
virtual const bool value() {
return GetServerConfigurableFlag(
- "com.example",
- "my_flag_one",
+ "ns",
+ "com.example.my_flag_one",
"false") == "true";
}
}
@@ -200,8 +215,8 @@
public:
virtual const bool value() {
return GetServerConfigurableFlag(
- "com.example",
- "my_flag_two",
+ "ns",
+ "com.example.my_flag_two",
"true") == "true";
}
}