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

Merge "Update codegen to use single channel in sys prop" into main

Browse Source
This commit is contained in:
Dennis Shen
2023-08-17 14:29:06 +00:00
committed by Gerrit Code Review
parent ef9ba4d22b b352b9d33f
commit f3ef7363a2
5 changed files with 12 additions and 12 deletions
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 { virtual bool disabled_rw() override {
return server_configurable_flags::GetServerConfigurableFlag( return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_test", "aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw", "com.android.aconfig.test.disabled_rw",
"false") == "true"; "false") == "true";
} }
@@ -300,7 +300,7 @@ namespace com::android::aconfig::test {
virtual bool enabled_rw() override { virtual bool enabled_rw() override {
return server_configurable_flags::GetServerConfigurableFlag( return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_test", "aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_rw", "com.android.aconfig.test.enabled_rw",
"true") == "true"; "true") == "true";
} }
@@ -363,7 +363,7 @@ namespace com::android::aconfig::test {
return it->second; return it->second;
} else { } else {
return server_configurable_flags::GetServerConfigurableFlag( return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_test", "aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw", "com.android.aconfig.test.disabled_rw",
"false") == "true"; "false") == "true";
} }
@@ -392,7 +392,7 @@ namespace com::android::aconfig::test {
return it->second; return it->second;
} else { } else {
return server_configurable_flags::GetServerConfigurableFlag( return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_test", "aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_rw", "com.android.aconfig.test.enabled_rw",
"true") == "true"; "true") == "true";
} }

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

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

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

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

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

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

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

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