Rename init_boot properties to ro.init_boot.*

Right now they're named ro.bootimage.* which is really confusing.
Change it so that if generic ramdisk is in boot.img, then name the
properties as ro.bootimage.*, otherwise if generic ramdisk is in
init_boot.img, then name the prop as ro.init_boot.*.

Bug: 211823573
Test: m dist
Change-Id: Icff3c7be04b9a3c6490fbf49ba4f05565b029890
This commit is contained in:
Yi-Yo Chiang 2022-03-15 17:40:23 +08:00
parent 5b48aeccb2
commit 411fac84d6
2 changed files with 4 additions and 3 deletions

View file

@ -501,10 +501,11 @@ $(eval $(call build-properties,\
# ramdisk/boot/etc/build.prop
#
RAMDISK_PARTITION_NAME := $(if $(BUILDING_INIT_BOOT_IMAGE),init_boot,bootimage)
RAMDISK_BUILD_PROP_REL_PATH := system/etc/ramdisk/build.prop
INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RAMDISK_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH)
$(eval $(call build-properties,\
bootimage,\
$(RAMDISK_PARTITION_NAME),\
$(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\
$(empty),\
$(empty),\

View file

@ -498,9 +498,9 @@ class BuildInfo(object):
def GetPartitionBuildProp(self, prop, partition):
"""Returns the inquired build property for the provided partition."""
# Boot image and init_boot image uses ro.[product.]bootimage instead of boot.
# Boot image uses ro.[product.]bootimage instead of boot.
# This comes from the generic ramdisk
prop_partition = "bootimage" if partition == "boot" or partition == "init_boot" else partition
prop_partition = "bootimage" if partition == "boot" else partition
# If provided a partition for this property, only look within that
# partition's build.prop.