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

Make use of ADDITIONAL_ODM_PROPERTIES

Browse Source 
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
This commit is contained in:
Jiyong Park
2020-05-25 17:37:28 +09:00
parent ae55638f75
commit ca9b02c1ce
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/main.mk
View File

@@ -313,6 +313,11 @@ ADDITIONAL_VENDOR_PROPERTIES += \
ro.build.ab_update=$(AB_OTA_UPDATER) ro.build.ab_update=$(AB_OTA_UPDATER)
endif 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 # 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 # modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value
# is "current", use PLATFORM_VNDK_VERSION. # is "current", use PLATFORM_VNDK_VERSION.

3
core/sysprop.mk
View File

@@ -368,9 +368,6 @@ $(INSTALLED_ODM_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PROPS)
@echo Target odm buildinfo: $@ @echo Target odm buildinfo: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) rm -f $@ && touch $@ $(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) $(call generate-common-build-props,odm,$@)
$(hide) $(foreach file,$(odm_prop_files), \ $(hide) $(foreach file,$(odm_prop_files), \
if [ -f "$(file)" ]; then \ if [ -f "$(file)" ]; then \