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
diff --git a/core/sysprop.mk b/core/sysprop.mk
index 43b8953..63574d0 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -501,10 +501,11 @@
# 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),\
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 9feb8af..1c29273 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -498,9 +498,9 @@
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.