commit e48d668a5bdf0b1cc97a4bce38a855eabe01542f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 06 22:51:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 06 22:51:13 2023 +0000
tree 0731295b8ff08d8d9fa2f0b89b99e1af0eeece97
parent f00b91522ba32acd2801e0a90d3e3d8432e2a511
parent c0cb8edeca0a26181a61dd297d6f8dc2b366f3b8

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

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

Change-Id: I77950ee6718fb728ec9f6c6a2c8d357165c479d5
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),\