Merge "aconfig: Fix missing header in the generated c/cpp code" into main am:... (373346a4) · Commits · e / os / android_build

Merge "aconfig: Fix missing header in the generated c/cpp code" into main am: am: Original change: https://android-review.googlesource.com/c/platform/build/+/2752628 Change-Id: Ic94bb30f7a4f81fe789ccb0cfd396031831e3f85 Signed-off-by:

tools/aconfig/src/codegen_cpp.rs

+1 −0

Original line number	Diff line number	Diff line
		@@ -364,6 +364,7 @@ bool com_android_aconfig_test_enabled_rw() {
		const TEST_SOURCE_FILE_EXPECTED: &str = r#"
		#include "com_android_aconfig_test.h"
		#include <server_configurable_flags/get_flags.h>
		#include <unordered_map>

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,9 @@
		{{ if readwrite }}
		#include <server_configurable_flags/get_flags.h>
		{{ endif }}
		{{ if for_test }}
		#include <unordered_map>
		{{ endif }}

		namespace {cpp_namespace} \{