commit 86c0c5aed49ae17bb862725367667f819c3443b1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 10 01:20:33 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 10 01:20:33 2024 +0000
tree 20938d9f16c76fbad2996b81ff5dac2f2fd42939
parent 621b6954961c78a14664a606b2f2ab8867e0e2c7
parent ec96fdedcb56be47e70b10ed5989b30e51903cc6

Merge "Import some product definition variables to Soong" into main am: 1681cc9b4d am: ec96fdedcb

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

Change-Id: I505017d7441503ca2e7a6f19875a12bb8479c044
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 aaeb70f..8c57ce6 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -316,6 +316,8 @@
 
 $(call add_json_str,  ProductManufacturer, $(PRODUCT_MANUFACTURER))
 $(call add_json_str,  ProductBrand,        $(PRODUCT_BRAND))
+$(call add_json_str,  ProductDevice,       $(PRODUCT_DEVICE))
+$(call add_json_str,  ProductModel,        $(PRODUCT_MODEL))
 
 $(call add_json_str, ReleaseVersion,    $(_RELEASE_VERSION))
 $(call add_json_list, ReleaseAconfigValueSets,    $(RELEASE_ACONFIG_VALUE_SETS))