commit b29ec6e9d6e97bedc2d88692465e30646e9392f7
author Inseob Kim <inseob@google.com> Mon Aug 26 15:56:45 2024 +0900
committer micky387 <mickaelsaibi@free.fr> Sat Nov 09 17:31:05 2024 -0500
tree 276590b381fa7daff4437815a2af6ed8f33ceb14
parent 697ac731b142fcd031e579cc1293af6f6333654e

Include TARGET_ODM_PROP to odm/etc/build.prop

It's missing in Soong's build_prop module.

Bug: 322090587
Bug: 361623560
Test: set TARGET_ODM_PROP and see odm/etc/build.prop
Change-Id: I670081bbe0addc8fed0b7c04ae560ef830cbfecf

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 8286359..42bab80 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1259,7 +1259,15 @@
 TARGET_PRODUCT_PROP := $(wildcard $(TARGET_DEVICE_DIR)/product.prop)
 endif
 
-.KATI_READONLY := TARGET_SYSTEM_PROP TARGET_SYSTEM_EXT_PROP TARGET_PRODUCT_PROP
+ifeq ($(TARGET_ODM_PROP),)
+TARGET_ODM_PROP := $(wildcard $(TARGET_DEVICE_DIR)/odm.prop)
+endif
+
+.KATI_READONLY := \
+    TARGET_SYSTEM_PROP \
+    TARGET_SYSTEM_EXT_PROP \
+    TARGET_PRODUCT_PROP \
+    TARGET_ODM_PROP \
 
 include $(BUILD_SYSTEM)/sysprop_config.mk
 

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 87e0633..a3ae055 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -350,6 +350,7 @@
 $(call add_json_list, SystemPropFiles, $(TARGET_SYSTEM_PROP))
 $(call add_json_list, SystemExtPropFiles, $(TARGET_SYSTEM_EXT_PROP))
 $(call add_json_list, ProductPropFiles, $(TARGET_PRODUCT_PROP))
+$(call add_json_list, OdmPropFiles, $(TARGET_ODM_PROP))
 
 # Do not set ArtTargetIncludeDebugBuild into any value if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD is not set,
 # to have the same behavior from runtime_libart.mk.