StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main

Browse Source
This commit is contained in:
Inseob Kim
2024-08-28 00:15:14 +00:00
committed by Gerrit Code Review
parent 2366366e9f 9e6cf672d9
commit 58ef2deebf
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/config.mk
View File

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

1
core/soong_config.mk
View File

@@ -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.