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 am: d57d4fed31

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

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

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

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

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

@@ -6,18 +6,15 @@ 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: {{ if item.readwrite- }}
virtual const bool value() \{ return GetServerConfigurableFlag(
{{ if item.readwrite- }} "{item.device_config_namespace}",
return GetServerConfigurableFlag( "{item.device_config_flag}",
"{item.device_config_namespace}", "{item.default_value}") == "true";
"{item.device_config_flag}", {{ -else- }}
"{item.default_value}") == "true"; return {item.default_value};
{{ -else- }} {{ -endif }}
return {item.default_value};
{{ -endif }}
}
} }
{{ endfor }} {{ endfor }}
} }