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

Commit e3981446 authored by Dennis Shen's avatar Dennis Shen
Browse files

aconfig: cpp codegen update: Move server_configurable_flags header include 

Move server_configurable_flags header include away from exported header,
instead put it in the flag provider headers. Otherwise, it can cause
compilation error if the source code who wants to use the generated c flag lib has
not added dependency on server_configurable_flags yet.

Bug: b/279483801
Test: atest aconfig.test
Change-Id: Ib75877ee88f995caf72b3fd2554c3da195032c14
parent 9ebfc231

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>