Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3ef7363 authored by Dennis Shen's avatar Dennis Shen Committed by Gerrit Code Review
Browse files

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

parents ef9ba4d2 b352b9d3

tools/aconfig/src/codegen_cpp.rs

+4 −4
Original line number Diff line number Diff line
@@ -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";

                }

tools/aconfig/src/codegen_rust.rs

+4 −4
Original line number Diff line number Diff line
@@ -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"

        )

tools/aconfig/templates/cpp_source_file.template

+2 −2
Original line number Diff line number Diff line
@@ -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- }}

tools/aconfig/templates/rust_prod.template

+1 −1
Original line number Diff line number Diff line
@@ -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- }}

tools/aconfig/templates/rust_test.template

+1 −1
Original line number Diff line number Diff line
@@ -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- }}