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

Commit ca9b02c1 authored by Jiyong Park's avatar Jiyong Park
Browse files

Make use of ADDITIONAL_ODM_PROPERTIES 

Properties that were defined in the build rule for odm/build.prop are
now defined via ADDITIONAL_ODM_PROPERTIES.

Bug: 117892318
Test: m
Change-Id: I6220e217d0724b6e27127786e7a908e1e662d1a0
parent ae55638f

core/main.mk

+5 −0
Original line number Diff line number Diff line
@@ -313,6 +313,11 @@ ADDITIONAL_VENDOR_PROPERTIES += \ 
    ro.build.ab_update=$(AB_OTA_UPDATER)

endif



ADDITIONAL_ODM_PROPERTIES += \

    ro.odm.product.cpu.abilist=$(TARGET_CPU_ABI_LIST) \

    ro.odm.product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT) \

    ro.odm.product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)



# Set ro.product.vndk.version to know the VNDK version required by product

# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value

# is "current", use PLATFORM_VNDK_VERSION.

core/sysprop.mk

+0 −3
Original line number Diff line number Diff line
@@ -368,9 +368,6 @@ $(INSTALLED_ODM_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PROPS) 
	@echo Target odm buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) rm -f $@ && touch $@

	$(hide) echo ro.odm.product.cpu.abilist="$(TARGET_CPU_ABI_LIST)">>$@

	$(hide) echo ro.odm.product.cpu.abilist32="$(TARGET_CPU_ABI_LIST_32_BIT)">>$@

	$(hide) echo ro.odm.product.cpu.abilist64="$(TARGET_CPU_ABI_LIST_64_BIT)">>$@

	$(hide) $(call generate-common-build-props,odm,$@)

	$(hide) $(foreach file,$(odm_prop_files), \

	    if [ -f "$(file)" ]; then \