commit 1030fb06f9af32ab292b7e5f4f69932a48be99b3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 06 21:34:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 06 21:34:22 2023 +0000
tree 251f06f3d5f3756070865916cb4549bbc1c99f63
parent ca14f7f971b38c0f9ae17654036d174a64187539
parent 1acc860f83e890e87185d0ab66225eb1a94b7737

Merge "Export build flags to soong." into main am: 1acc860f83

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

Change-Id: Ic17643c06edb3d3988bf6a09dbdc31d63004b0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index be6a795..e39f2fa 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -169,6 +169,11 @@
 $(call add_json_bool, VndkUseCoreVariant,                $(TARGET_VNDK_USE_CORE_VARIANT))
 $(call add_json_bool, VndkSnapshotBuildArtifacts,        $(VNDK_SNAPSHOT_BUILD_ARTIFACTS))
 
+$(call add_json_map,  BuildFlags)
+$(foreach flag,$(_ALL_RELEASE_FLAGS),\
+  $(call add_json_str,$(flag),$(_ALL_RELEASE_FLAGS.$(flag).VALUE)))
+$(call end_json_map)
+
 $(call add_json_bool, DirectedVendorSnapshot,            $(DIRECTED_VENDOR_SNAPSHOT))
 $(call add_json_map,  VendorSnapshotModules)
 $(foreach module,$(VENDOR_SNAPSHOT_MODULES),\