commit d637b06d8f445f5aa433df413c5bfcb3943a0c6e
author Wei Li <weiwli@google.com> Thu May 04 08:45:16 2023 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri May 19 00:35:09 2023 +0000
tree 89387b9d9c6ec20fc870b7a48d34fbc55a8ea025
parent b87d46cb1a7934e872e6bebc6fa96ec4e52b92cf

Export some make variables to soong.variables.

Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:996830047f79a5b9e9c9ed590886217068d9576e)
Merged-In: I2e7a07007224364418659453d979e2bee58fe5f9
Change-Id: I2e7a07007224364418659453d979e2bee58fe5f9

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))