commit 4f78f1001584dafd6543f998fe55ccd730820306
author Dennis Shen <dzshen@google.com> Fri Jun 09 18:01:56 2023 +0000
committer Dennis Shen <dzshen@google.com> Mon Jun 12 12:57:38 2023 +0000
tree 6cde0f832c7789352d6ec7bab8037db204056393
parent a0c6f31ef7e75bef18ee5fe435b38ec16057b9a6

aconfig: update cpp codegen to use static methods

Update c++ codegen to static methods interface.

Bug: b/279483801
Test: atest aconfig.test
Change-Id: I78da3bbca6240bee660c692807930d00f2242b0a

tools/aconfig/src/codegen_cpp.rs

diff --git a/tools/aconfig/src/codegen_cpp.rs b/tools/aconfig/src/codegen_cpp.rs
index 2c32bb0..37b058d 100644
--- a/tools/aconfig/src/codegen_cpp.rs
+++ b/tools/aconfig/src/codegen_cpp.rs
@@ -134,18 +134,12 @@
 
         namespace com::example {
 
-            class my_flag_one {
-                public:
-                    virtual const bool value() {
-                        return false;
-                    }
+            static const bool my_flag_one() {
+                return false;
             }
 
-            class my_flag_two {
-                public:
-                    virtual const bool value() {
-                        return true;
-                    }
+            static const bool my_flag_two() {
+                return true;
             }
 
         }
@@ -201,24 +195,18 @@
 
         namespace com::example {
 
-            class my_flag_one {
-                public:
-                    virtual const bool value() {
-                        return GetServerConfigurableFlag(
-                            "ns",
-                            "com.example.my_flag_one",
-                            "false") == "true";
-                    }
+            static const bool my_flag_one() {
+                return GetServerConfigurableFlag(
+                    "ns",
+                    "com.example.my_flag_one",
+                    "false") == "true";
             }
 
-            class my_flag_two {
-                public:
-                    virtual const bool value() {
-                        return GetServerConfigurableFlag(
-                            "ns",
-                            "com.example.my_flag_two",
-                            "true") == "true";
-                    }
+            static const bool my_flag_two() {
+                return GetServerConfigurableFlag(
+                    "ns",
+                    "com.example.my_flag_two",
+                    "true") == "true";
             }
 
         }

tools/aconfig/templates/cpp.template

diff --git a/tools/aconfig/templates/cpp.template b/tools/aconfig/templates/cpp.template
index 93f9b80..aa36d94 100644
--- a/tools/aconfig/templates/cpp.template
+++ b/tools/aconfig/templates/cpp.template
@@ -6,18 +6,15 @@
 {{ endif }}
 namespace {cpp_namespace} \{
     {{ for item in class_elements}}
-    class {item.flag_name} \{
-        public:
-            virtual const bool value() \{
-                {{ if item.readwrite- }}
-                return GetServerConfigurableFlag(
-                    "{item.device_config_namespace}",
-                    "{item.device_config_flag}",
-                    "{item.default_value}") == "true";
-                {{ -else- }}
-                return {item.default_value};
-                {{ -endif }}
-            }
+    static const bool {item.flag_name}() \{
+        {{ if item.readwrite- }}
+        return GetServerConfigurableFlag(
+            "{item.device_config_namespace}",
+            "{item.device_config_flag}",
+            "{item.default_value}") == "true";
+        {{ -else- }}
+            return {item.default_value};
+        {{ -endif }}
     }
     {{ endfor }}
 }