Merge "aconfig: update codegen templates" into main
diff --git a/tools/aconfig/Android.bp b/tools/aconfig/Android.bp
index 0e3c37c..37be2dd 100644
--- a/tools/aconfig/Android.bp
+++ b/tools/aconfig/Android.bp
@@ -44,7 +44,6 @@
protos: ["protos/aconfig.proto"],
crate_name: "aconfig_protos",
source_stem: "aconfig_protos",
- use_protobuf3: true,
host_supported: true,
}
diff --git a/tools/aconfig/TEST_MAPPING b/tools/aconfig/TEST_MAPPING
index e29918f..de8d932 100644
--- a/tools/aconfig/TEST_MAPPING
+++ b/tools/aconfig/TEST_MAPPING
@@ -24,6 +24,10 @@
"name": "aconfig.test"
},
{
+ // aconfig Java integration tests (host)
+ "name": "AconfigJavaHostTest"
+ },
+ {
// aconfig Java integration tests
"name": "aconfig.test.java"
},
@@ -36,14 +40,22 @@
"name": "aconfig.test.cpp.test_mode"
},
{
- // aconfig C++ integration tests (production mode auto-generated code)
+ // aconfig C++ integration tests (exported mode auto-generated code)
+ "name": "aconfig.test.cpp.exported_mode"
+ },
+ {
+ // aconfig Rust integration tests (production mode auto-generated code)
"name": "aconfig.prod_mode.test.rust"
},
{
- // aconfig C++ integration tests (test mode auto-generated code)
+ // aconfig Rust integration tests (test mode auto-generated code)
"name": "aconfig.test_mode.test.rust"
},
{
+ // aconfig Rust integration tests (exported mode auto-generated code)
+ "name": "aconfig.exported_mode.test.rust"
+ },
+ {
// printflags unit tests
"name": "printflags.test"
}
diff --git a/tools/aconfig/src/main.rs b/tools/aconfig/src/main.rs
index c6adff7..59f3677 100644
--- a/tools/aconfig/src/main.rs
+++ b/tools/aconfig/src/main.rs
@@ -107,7 +107,8 @@
.arg(Arg::new("out").long("out").default_value("-")),
)
.subcommand(
- Command::new("dump")
+ Command::new("dump-cache")
+ .alias("dump")
.arg(Arg::new("cache").long("cache").action(ArgAction::Append))
.arg(
Arg::new("format")
@@ -260,7 +261,7 @@
let path = get_required_arg::<String>(sub_matches, "out")?;
write_output_to_file_or_stdout(path, &output)?;
}
- Some(("dump", sub_matches)) => {
+ Some(("dump-cache", sub_matches)) => {
let input = open_zero_or_more_files(sub_matches, "cache")?;
let format = get_required_arg::<DumpFormat>(sub_matches, "format")
.context("failed to dump previously parsed flags")?;