commit d94bb431aaff8468c07757b65243e6c8cc917abd
author Trevor Radcliffe <tradical@google.com> Tue Mar 22 19:04:03 2022 +0000
committer Trevor Radcliffe <tradical@google.com> Tue Mar 22 19:04:03 2022 +0000
tree c872b669edb390545a7bafac2716ec0a12ff7db5
parent 2089403223746ffde8050e68bdc30d40634b981a

Add DeviceProduct product varible to Soong

For some modules, it is necessary to access the product name from
Soong. In particular, the use case we have identified is that the
product name needs to be appended to the artifact name in the dist
copy.

Bug: 224561567
Test: Unit Tests and build relevant target/modules
Change-Id: Iaa0bfee8ef0d1201d8af02f7fc9e6ef081175da7

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index fd957c3..916dfbb 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -46,6 +46,7 @@
 $(call add_json_bool, Eng,                               $(filter eng,$(TARGET_BUILD_VARIANT)))
 
 $(call add_json_str,  DeviceName,                        $(TARGET_DEVICE))
+$(call add_json_str,  DeviceProduct,                     $(TARGET_PRODUCT))
 $(call add_json_str,  DeviceArch,                        $(TARGET_ARCH))
 $(call add_json_str,  DeviceArchVariant,                 $(TARGET_ARCH_VARIANT))
 $(call add_json_str,  DeviceCpuVariant,                  $(TARGET_CPU_VARIANT))