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

Merge "aconfig: update cpp codegen to use static methods" am: f1cd83bece

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620871

Change-Id: I614fac778dd96a3da711ea9cbd78ee8656725cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dennis Shen
2023-06-12 13:43:38 +00:00
committed by Automerger Merge Worker
parent 75b75c9b8a f1cd83bece
commit d57d4fed31
2 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/aconfig/src/codegen_cpp.rs
View File

@@ -134,19 +134,13 @@ mod tests {
namespace com::example { namespace com::example {
class my_flag_one { static const bool my_flag_one() {
public:
virtual const bool value() {
return false; return false;
} }
}
class my_flag_two { static const bool my_flag_two() {
public:
virtual const bool value() {
return true; return true;
} }
}
} }
#endif #endif
@@ -201,25 +195,19 @@ mod tests {
namespace com::example { namespace com::example {
class my_flag_one { static const bool my_flag_one() {
public:
virtual const bool value() {
return GetServerConfigurableFlag( return GetServerConfigurableFlag(
"ns", "ns",
"com.example.my_flag_one", "com.example.my_flag_one",
"false") == "true"; "false") == "true";
} }
}
class my_flag_two { static const bool my_flag_two() {
public:
virtual const bool value() {
return GetServerConfigurableFlag( return GetServerConfigurableFlag(
"ns", "ns",
"com.example.my_flag_two", "com.example.my_flag_two",
"true") == "true"; "true") == "true";
} }
}
} }
#endif #endif

5
tools/aconfig/templates/cpp.template
View File

@@ -6,9 +6,7 @@ using namespace server_configurable_flags;
{{ endif }} {{ endif }}
namespace {cpp_namespace} \{ namespace {cpp_namespace} \{
{{ for item in class_elements}} {{ for item in class_elements}}
class {item.flag_name} \{ static const bool {item.flag_name}() \{
public:
virtual const bool value() \{
{{ if item.readwrite- }} {{ if item.readwrite- }}
return GetServerConfigurableFlag( return GetServerConfigurableFlag(
"{item.device_config_namespace}", "{item.device_config_namespace}",
@@ -18,7 +16,6 @@ namespace {cpp_namespace} \{
return {item.default_value}; return {item.default_value};
{{ -endif }} {{ -endif }}
} }
}
{{ endfor }} {{ endfor }}
} }
#endif #endif