commit 290eb2a1e29687a619c87f6c62decfccbec4af85
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 22 02:43:54 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 22 02:43:54 2024 +0000
tree 5eb6340d21b874d7f9b4bca224dd199d81415ea3
parent 83057de6fdd6ba143ce9b087e5a86027b3752b85
parent 0ea5497ce463b89a5d9a09d88c8e8e435029c987

Merge "Export release flag types to soong" into main am: 0ea5497ce4

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

Change-Id: Ic75a085dce3dfa8a27cef63416975c73b2eb4aa1
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 acd213c..7300e8c 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -174,6 +174,10 @@
 $(foreach flag,$(_ALL_RELEASE_FLAGS),\
   $(call add_json_str,$(flag),$(_ALL_RELEASE_FLAGS.$(flag).VALUE)))
 $(call end_json_map)
+$(call add_json_map,  BuildFlagTypes)
+$(foreach flag,$(_ALL_RELEASE_FLAGS),\
+  $(call add_json_str,$(flag),$(_ALL_RELEASE_FLAGS.$(flag).TYPE)))
+$(call end_json_map)
 
 $(call add_json_bool, DirectedVendorSnapshot,            $(DIRECTED_VENDOR_SNAPSHOT))
 $(call add_json_map,  VendorSnapshotModules)