aconfig: allow dots in package fields
Allow package fields to include dots.
Update the generated code based on the package name: if the package name
is com.android.example:
- java: package com.android.example; ...
- C++: namespace com::android::example { ... }
- Rust: mod com { mod android { mod example { ... } } }
Also, update examples to use dots in the package fields.
Also, remove unnecessary #include from the auto-generated C++ code: the
header should not include itself.
Bug: 285000854
Test: atest aconfig.test
Change-Id: I8a5352e25c64c34dee0725202a1b7c9957819de8
diff --git a/tools/aconfig/src/cache.rs b/tools/aconfig/src/cache.rs
index f531aab..cdb0992 100644
--- a/tools/aconfig/src/cache.rs
+++ b/tools/aconfig/src/cache.rs
@@ -109,7 +109,7 @@
impl CacheBuilder {
pub fn new(package: String) -> Result<CacheBuilder> {
- ensure!(codegen::is_valid_identifier(&package), "bad package");
+ ensure!(codegen::is_valid_package_ident(&package), "bad package");
let cache = Cache { package, items: vec![] };
Ok(CacheBuilder { cache })
}
@@ -119,7 +119,7 @@
source: Source,
declaration: FlagDeclaration,
) -> Result<&mut CacheBuilder> {
- ensure!(codegen::is_valid_identifier(&declaration.name), "bad flag name");
+ ensure!(codegen::is_valid_name_ident(&declaration.name), "bad flag name");
ensure!(!declaration.description.is_empty(), "empty flag description");
ensure!(
self.cache.items.iter().all(|item| item.name != declaration.name),
@@ -147,8 +147,8 @@
source: Source,
value: FlagValue,
) -> Result<&mut CacheBuilder> {
- ensure!(codegen::is_valid_identifier(&value.package), "bad flag package");
- ensure!(codegen::is_valid_identifier(&value.name), "bad flag name");
+ ensure!(codegen::is_valid_package_ident(&value.package), "bad flag package");
+ ensure!(codegen::is_valid_name_ident(&value.name), "bad flag name");
ensure!(
value.package == self.cache.package,
"failed to set values for flag {}/{} from {}: expected package {}",
@@ -182,7 +182,7 @@
#[test]
fn test_add_flag_declaration() {
- let mut builder = CacheBuilder::new("ns".to_string()).unwrap();
+ let mut builder = CacheBuilder::new("com.example".to_string()).unwrap();
builder
.add_flag_declaration(
Source::File("first.txt".to_string()),
@@ -217,12 +217,12 @@
#[test]
fn test_add_flag_value() {
- let mut builder = CacheBuilder::new("ns".to_string()).unwrap();
+ let mut builder = CacheBuilder::new("com.example".to_string()).unwrap();
let error = builder
.add_flag_value(
Source::Memory,
FlagValue {
- package: "ns".to_string(),
+ package: "com.example".to_string(),
name: "foo".to_string(),
state: FlagState::Enabled,
permission: Permission::ReadOnly,
@@ -231,7 +231,7 @@
.unwrap_err();
assert_eq!(
&format!("{:?}", error),
- "failed to set values for flag ns/foo from <memory>: flag not declared"
+ "failed to set values for flag com.example/foo from <memory>: flag not declared"
);
builder
@@ -245,7 +245,7 @@
.add_flag_value(
Source::Memory,
FlagValue {
- package: "ns".to_string(),
+ package: "com.example".to_string(),
name: "foo".to_string(),
state: FlagState::Disabled,
permission: Permission::ReadOnly,
@@ -257,7 +257,7 @@
.add_flag_value(
Source::Memory,
FlagValue {
- package: "ns".to_string(),
+ package: "com.example".to_string(),
name: "foo".to_string(),
state: FlagState::Enabled,
permission: Permission::ReadWrite,
@@ -277,7 +277,7 @@
},
)
.unwrap_err();
- assert_eq!(&format!("{:?}", error), "failed to set values for flag some_other_package/foo from <memory>: expected package ns");
+ assert_eq!(&format!("{:?}", error), "failed to set values for flag some_other_package/foo from <memory>: expected package com.example");
let cache = builder.build();
let item = cache.iter().find(|&item| item.name == "foo").unwrap();
@@ -292,7 +292,7 @@
#[test]
fn test_reject_empty_flag_declaration_fields() {
- let mut builder = CacheBuilder::new("ns".to_string()).unwrap();
+ let mut builder = CacheBuilder::new("com.example".to_string()).unwrap();
let error = builder
.add_flag_declaration(
@@ -313,7 +313,7 @@
#[test]
fn test_reject_empty_flag_value_files() {
- let mut builder = CacheBuilder::new("ns".to_string()).unwrap();
+ let mut builder = CacheBuilder::new("com.example".to_string()).unwrap();
builder
.add_flag_declaration(
Source::Memory,
@@ -338,7 +338,7 @@
.add_flag_value(
Source::Memory,
FlagValue {
- package: "ns".to_string(),
+ package: "com.example".to_string(),
name: "".to_string(),
state: FlagState::Enabled,
permission: Permission::ReadOnly,