commit 1681cc9b4da3693882f5015b64e590a0b0c66483
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 10 00:39:28 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 10 00:39:28 2024 +0000
tree 37843f2ab6207550c66e6e539d9229dcd364c404
parent 10a66b3b08dcee24c48576c1e97015e4907dc6bb
parent d490af1b2540bac0f6809bbcf5e8babd942fc15c

Merge "Import some product definition variables to Soong" into main

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