commit ec96fdedcb56be47e70b10ed5989b30e51903cc6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 10 01:00:15 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 10 01:00:15 2024 +0000
tree d9672be97522cc455d5a647b2568de6282a213eb
parent d023ecfd1ef8134b4bf546cd2461aef867d1d577
parent 1681cc9b4da3693882f5015b64e590a0b0c66483

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

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

Change-Id: I14ccada96d3252838e1d5503c05d029a152946a3
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))