Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58ef2dee authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

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

parents 2366366e 9e6cf672

core/config.mk

+9 −1
Original line number Diff line number Diff line
@@ -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

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -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.