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

Commit 1006a530 authored by Dennis Shen's avatar Dennis Shen Committed by Automerger Merge Worker
Browse files

Merge "aconfig: add missing string header to template" into main am:... 

Merge "aconfig: add missing string header to template" into main am: 268e4455 am: e857396e am: d3faf89b

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



Change-Id: I69e2e9a7eba2c0bdc99accb444bba46acc92b2c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3515661d d3faf89b

tools/aconfig/src/codegen_cpp.rs

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ bool com_android_aconfig_test_enabled_rw() { 
#include "com_android_aconfig_test.h"

#include <server_configurable_flags/get_flags.h>

#include <unordered_map>

#include <string>



namespace com::android::aconfig::test {

tools/aconfig/templates/cpp_source_file.template

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
{{ endif }}

{{ if for_test }}

#include <unordered_map>

#include <string>

{{ endif }}



namespace {cpp_namespace} \{