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

Merge "aconfig: move cache_ as a memeber" into main am: 8a64367cb5

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

Change-Id: I221740ec17676eb6c55db020f5b16fd132d7d9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wonsik Kim
2023-11-21 18:24:41 +00:00
committed by Automerger Merge Worker
parent 2a4fb8417e 8a64367cb5
commit 90f1cbbef4
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,12 +151,9 @@ mod tests {
#ifdef __cplusplus #ifdef __cplusplus
#include <memory> #include <memory>
#include <vector>
namespace com::android::aconfig::test { namespace com::android::aconfig::test {
extern std::vector<int8_t> cache_;
class flag_provider_interface { class flag_provider_interface {
public: public:
virtual ~flag_provider_interface() = default; virtual ~flag_provider_interface() = default;
@@ -359,6 +356,7 @@ void com_android_aconfig_test_reset_flags();
const PROD_SOURCE_FILE_EXPECTED: &str = r#" const PROD_SOURCE_FILE_EXPECTED: &str = r#"
#include "com_android_aconfig_test.h" #include "com_android_aconfig_test.h"
#include <server_configurable_flags/get_flags.h> #include <server_configurable_flags/get_flags.h>
#include <vector>
namespace com::android::aconfig::test { namespace com::android::aconfig::test {
@@ -407,9 +405,9 @@ namespace com::android::aconfig::test {
return cache_[2]; 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::unique_ptr<flag_provider_interface> provider_ =
std::make_unique<flag_provider>(); std::make_unique<flag_provider>();

7
tools/aconfig/templates/cpp_exported_header.template
View File

@@ -18,16 +18,9 @@
#ifdef __cplusplus #ifdef __cplusplus
#include <memory> #include <memory>
{{ if not for_test- }}
#include <vector>
{{ -endif }}
namespace {cpp_namespace} \{ namespace {cpp_namespace} \{
{{ if not for_test- }}
extern std::vector<int8_t> cache_;
{{ -endif }}
class flag_provider_interface \{ class flag_provider_interface \{
public: public:
virtual ~flag_provider_interface() = default; virtual ~flag_provider_interface() = default;

7
tools/aconfig/templates/cpp_source_file.template
View File

@@ -5,6 +5,8 @@
{{ if for_test }} {{ if for_test }}
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
{{ -else- }}
#include <vector>
{{ endif }} {{ endif }}
namespace {cpp_namespace} \{ namespace {cpp_namespace} \{
@@ -69,16 +71,15 @@ namespace {cpp_namespace} \{
{{ -endif }} {{ -endif }}
} }
{{ endfor }} {{ 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 }} {{ -endif }}
std::unique_ptr<flag_provider_interface> provider_ = std::unique_ptr<flag_provider_interface> provider_ =
std::make_unique<flag_provider>(); std::make_unique<flag_provider>();
} }