diff options
| author | 2023-11-21 17:57:39 +0000 | |
|---|---|---|
| committer | 2023-11-21 17:57:39 +0000 | |
| commit | 8a64367cb5513f9761ca86c9b3f03bd304b5cdae (patch) | |
| tree | e80c28346fed4fa074839cc78a598a83d91462c2 | |
| parent | c35ca4de22ac89222afd0071bb4f4b378f3e5af0 (diff) | |
| parent | d4d952f9d205cb8a7bf7e59bbe6e95e030e1d5e3 (diff) | |
Merge "aconfig: move `cache_` as a memeber" into main
| -rw-r--r-- | tools/aconfig/src/codegen_cpp.rs | 8 | ||||
| -rw-r--r-- | tools/aconfig/templates/cpp_exported_header.template | 7 | ||||
| -rw-r--r-- | tools/aconfig/templates/cpp_source_file.template | 7 |
3 files changed, 7 insertions, 15 deletions
diff --git a/tools/aconfig/src/codegen_cpp.rs b/tools/aconfig/src/codegen_cpp.rs index 42d900b348..5aa373aab9 100644 --- a/tools/aconfig/src/codegen_cpp.rs +++ b/tools/aconfig/src/codegen_cpp.rs @@ -151,12 +151,9 @@ mod tests { #ifdef __cplusplus #include <memory> -#include <vector> namespace com::android::aconfig::test { -extern std::vector<int8_t> cache_; - class flag_provider_interface { public: virtual ~flag_provider_interface() = default; @@ -359,6 +356,7 @@ void com_android_aconfig_test_reset_flags(); const PROD_SOURCE_FILE_EXPECTED: &str = r#" #include "com_android_aconfig_test.h" #include <server_configurable_flags/get_flags.h> +#include <vector> namespace com::android::aconfig::test { @@ -407,10 +405,10 @@ namespace com::android::aconfig::test { return cache_[2]; } + private: + std::vector<int8_t> cache_ = std::vector<int8_t>(3, -1); }; - std::vector<int8_t> cache_ = std::vector<int8_t>(3, -1); - std::unique_ptr<flag_provider_interface> provider_ = std::make_unique<flag_provider>(); } diff --git a/tools/aconfig/templates/cpp_exported_header.template b/tools/aconfig/templates/cpp_exported_header.template index d19c0faccf..cc1b18d98c 100644 --- a/tools/aconfig/templates/cpp_exported_header.template +++ b/tools/aconfig/templates/cpp_exported_header.template @@ -18,16 +18,9 @@ #ifdef __cplusplus #include <memory> -{{ if not for_test- }} -#include <vector> -{{ -endif }} namespace {cpp_namespace} \{ -{{ if not for_test- }} -extern std::vector<int8_t> cache_; -{{ -endif }} - class flag_provider_interface \{ public: virtual ~flag_provider_interface() = default; diff --git a/tools/aconfig/templates/cpp_source_file.template b/tools/aconfig/templates/cpp_source_file.template index 91e828aa3c..1bfa4b69b4 100644 --- a/tools/aconfig/templates/cpp_source_file.template +++ b/tools/aconfig/templates/cpp_source_file.template @@ -5,6 +5,8 @@ {{ if for_test }} #include <unordered_map> #include <string> +{{ -else- }} +#include <vector> {{ endif }} namespace {cpp_namespace} \{ @@ -69,16 +71,15 @@ namespace {cpp_namespace} \{ {{ -endif }} } {{ endfor }} + private: + std::vector<int8_t> cache_ = std::vector<int8_t>({readwrite_count}, -1); }; - std::vector<int8_t> cache_ = std::vector<int8_t>({readwrite_count}, -1); {{ -endif }} std::unique_ptr<flag_provider_interface> provider_ = std::make_unique<flag_provider>(); - - } |