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 am: 58ef2deebf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3237921

Change-Id: Ie7b8b148c02758df3cf12995a98395a141cbc76f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Inseob Kim
2024-08-28 00:20:56 +00:00
committed by Automerger Merge Worker
parent 766a3487ef 58ef2deebf
commit 8774b552b8
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

@@ -1263,7 +1263,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.