tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update codegen to use single channel in sys prop

Browse source 
Update sys prop name from persist.device_config.<namespace>.<flag> to persist.aconfig_flags.aconfig_flags.<namespace>.<flag>

Bug: b/295379636
Change-Id: I78f00daa574dc016902dce4b9b4ec961f973693c
This commit is contained in:
Dennis Shen 2023-08-16 17:33:33 +00:00
parent 7e730893f1
commit b352b9d33f
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/aconfig/src/codegen_cpp.rs
View file

@ -289,7 +289,7 @@ namespace com::android::aconfig::test {
virtual bool disabled_rw() override {
return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_test",
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw",
"false") == "true";
}
@ -300,7 +300,7 @@ namespace com::android::aconfig::test {
virtual bool enabled_rw() override {
return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_test",
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_rw",
"true") == "true";
}
@ -363,7 +363,7 @@ namespace com::android::aconfig::test {
return it->second;
} else {
return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_test",
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw",
"false") == "true";
}
@ -392,7 +392,7 @@ namespace com::android::aconfig::test {
return it->second;
} else {
return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_test",
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_rw",
"true") == "true";
}

8
tools/aconfig/src/codegen_rust.rs
View file

@ -103,7 +103,7 @@ impl FlagProvider {
/// query flag disabled_rw
pub fn disabled_rw(&self) -> bool {
flags_rust::GetServerConfigurableFlag(
"aconfig_test",
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw",
"false") == "true"
}
@ -116,7 +116,7 @@ impl FlagProvider {
/// query flag enabled_rw
pub fn enabled_rw(&self) -> bool {
flags_rust::GetServerConfigurableFlag(
"aconfig_test",
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_rw",
"true") == "true"
}
@ -178,7 +178,7 @@ impl FlagProvider {
pub fn disabled_rw(&self) -> bool {
self.overrides.get("disabled_rw").copied().unwrap_or(
flags_rust::GetServerConfigurableFlag(
"aconfig_test",
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw",
"false") == "true"
)
@ -205,7 +205,7 @@ impl FlagProvider {
pub fn enabled_rw(&self) -> bool {
self.overrides.get("enabled_rw").copied().unwrap_or(
flags_rust::GetServerConfigurableFlag(
"aconfig_test",
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_rw",
"true") == "true"
)

4
tools/aconfig/templates/cpp_source_file.template
View file

@ -23,7 +23,7 @@ namespace {cpp_namespace} \{
} else \{
{{ if item.readwrite- }}
return server_configurable_flags::GetServerConfigurableFlag(
"{item.device_config_namespace}",
"aconfig_flags.{item.device_config_namespace}",
"{item.device_config_flag}",
"{item.default_value}") == "true";
{{ -else- }}
@ -50,7 +50,7 @@ namespace {cpp_namespace} \{
virtual bool {item.flag_name}() override \{
{{ if item.readwrite- }}
return server_configurable_flags::GetServerConfigurableFlag(
"{item.device_config_namespace}",
"aconfig_flags.{item.device_config_namespace}",
"{item.device_config_flag}",
"{item.default_value}") == "true";
{{ -else- }}

2
tools/aconfig/templates/rust_prod.template
View file

@ -10,7 +10,7 @@ impl FlagProvider \{
pub fn {flag.name}(&self) -> bool \{
{{ if flag.readwrite -}}
flags_rust::GetServerConfigurableFlag(
"{flag.device_config_namespace}",
"aconfig_flags.{flag.device_config_namespace}",
"{flag.device_config_flag}",
"{flag.default_value}") == "true"
{{ -else- }}

2
tools/aconfig/templates/rust_test.template
View file

@ -15,7 +15,7 @@ impl FlagProvider \{
self.overrides.get("{flag.name}").copied().unwrap_or(
{{ if flag.readwrite -}}
flags_rust::GetServerConfigurableFlag(
"{flag.device_config_namespace}",
"aconfig_flags.{flag.device_config_namespace}",
"{flag.device_config_flag}",
"{flag.default_value}") == "true"
{{ -else- }}