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

Commit a8921808 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "aconfig: cpp codegen update: Move server_configurable_flags header... 

Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main am: db2c2d23

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



Change-Id: Ib20b5a4a142c650e3c39f51d688e72d8294aaff3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4204e8b1 db2c2d23

tools/aconfig/src/codegen_cpp.rs

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

tools/aconfig/templates/cpp_exported_header.template

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

tools/aconfig/templates/cpp_prod_flag_provider.template

+4 −0
Original line number Diff line number Diff line 
#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 \{

tools/aconfig/templates/cpp_test_flag_provider.template

+5 −0
Original line number Diff line number Diff line
@@ -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>