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

aconfig: cpp codegen update: Move server_configurable_flags header include

Browse Source 
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
This commit is contained in:
Dennis Shen
2023-07-10 18:15:42 +00:00
parent 9ebfc23191
commit e398144643
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>