From 9e6cf672d9971b29a4e9881d587d15cb2c290d90 Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Mon, 26 Aug 2024 15:56:45 +0900
Subject: [PATCH] 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       | 10 +++++++++-
 core/soong_config.mk |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/config.mk b/core/config.mk
index 0ecee8ac8e..76ad361cf9 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1258,7 +1258,15 @@ ifeq ($(TARGET_PRODUCT_PROP),)
 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
 
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 14ea2aab4a..a018c9b52f 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -344,6 +344,7 @@ $(call add_json_list, OemProperties, $(PRODUCT_OEM_PROPERTIES))
 $(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.