Merge "Revert "Rename init_boot properties to ro.init_boot.*""
diff --git a/core/sysprop.mk b/core/sysprop.mk
index dec9be1..61c07ba 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -519,11 +519,10 @@
# 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,\
- $(RAMDISK_PARTITION_NAME),\
+ bootimage,\
$(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\
$(empty),\
$(empty),\
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 2f46576..bd3af68 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -495,9 +495,9 @@
def GetPartitionBuildProp(self, prop, partition):
"""Returns the inquired build property for the provided partition."""
- # Boot image uses ro.[product.]bootimage instead of boot.
+ # Boot image and init_boot image uses ro.[product.]bootimage instead of boot.
# This comes from the generic ramdisk
- prop_partition = "bootimage" if partition == "boot" else partition
+ prop_partition = "bootimage" if partition == "boot" or partition == "init_boot" else partition
# If provided a partition for this property, only look within that
# partition's build.prop.