commit c51b703b2f6917063c8535de61f95deb62485bb5
author Wei Li <weiwli@google.com> Fri May 19 23:10:26 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 19 23:10:26 2023 +0000
tree 89387b9d9c6ec20fc870b7a48d34fbc55a8ea025
parent 76e9cbba65b54cb244ed12a28c3516e2cee4039a
parent 02959543d0a585ca313dd37c9a7ff4c344f44db0

Export some make variables to soong.variables. am: d637b06d8f am: 02959543d0

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

Change-Id: Ibeca00ccd1fed1a4c268b1f2efaf3ff5c1ab1976
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 b3e2303..a149e2a 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -323,6 +323,10 @@
 
 $(call add_json_list, AfdoProfiles,                $(ALL_AFDO_PROFILES))
 
+$(call add_json_str,  ProductManufacturer, $(PRODUCT_MANUFACTURER))
+$(call add_json_str,  ProductBrand,        $(PRODUCT_BRAND))
+$(call add_json_list, BuildVersionTags,    $(BUILD_VERSION_TAGS))
+
 $(call json_end)
 
 $(file >$(SOONG_VARIABLES).tmp,$(json_contents))