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

Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main am: db2c2d2377 am: a89218087e am: 3eccd72fa3

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

Change-Id: Ief5bc225f7fcb1be7f921a7e327fc30dc4530c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-11 10:38:49 +00:00
committed by Automerger Merge Worker
parent 1610101e46 3eccd72fa3
commit 32c45b78da
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,8 +133,6 @@ mod tests {
#include <string>
#include <memory>
#include <server_configurable_flags/get_flags.h>
using namespace server_configurable_flags;
namespace com::android::aconfig::test {
class flag_provider_interface {
@@ -196,8 +194,6 @@ inline void reset_overrides() {
#include <string>
#include <memory>
#include <server_configurable_flags/get_flags.h>
using namespace server_configurable_flags;
namespace com::android::aconfig::test {
class flag_provider_interface {
@@ -258,6 +254,8 @@ inline void reset_overrides() {
#define com_android_aconfig_test_flag_provider_HEADER_H
#include "com_android_aconfig_test.h"
#include <server_configurable_flags/get_flags.h>
using namespace server_configurable_flags;
namespace com::android::aconfig::test {
class flag_provider : public flag_provider_interface {
@@ -294,6 +292,8 @@ public:
#define com_android_aconfig_test_flag_provider_HEADER_H
#include "com_android_aconfig_test.h"
#include <server_configurable_flags/get_flags.h>
using namespace server_configurable_flags;
#include <unordered_map>
#include <unordered_set>

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

@@ -3,10 +3,7 @@
#include <string>
#include <memory>
{{ if readwrite }}
#include <server_configurable_flags/get_flags.h>
using namespace server_configurable_flags;
{{ endif }}
namespace {cpp_namespace} \{
class flag_provider_interface \{

4
tools/aconfig/templates/cpp_prod_flag_provider.template
View File

@@ -1,6 +1,10 @@
#ifndef {header}_flag_provider_HEADER_H
#define {header}_flag_provider_HEADER_H
#include "{header}.h"
{{ if readwrite }}
#include <server_configurable_flags/get_flags.h>
using namespace server_configurable_flags;
{{ endif }}
namespace {cpp_namespace} \{
class flag_provider : public flag_provider_interface \{

5
tools/aconfig/templates/cpp_test_flag_provider.template
View File

@@ -2,6 +2,11 @@
#define {header}_flag_provider_HEADER_H
#include "{header}.h"
{{ if readwrite }}
#include <server_configurable_flags/get_flags.h>
using namespace server_configurable_flags;
{{ endif }}
#include <unordered_map>
#include <unordered_set>
#include <cassert>