From 8250d2cd9e5387f5836719c01274ed3c0bf57dc0 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Wed, 23 Mar 2022 19:46:09 +0000
Subject: [PATCH] Revert "Rename init_boot properties to ro.init_boot.*"

This reverts commit 411fac84d67970b0c06c67c7ab41224166564e3b.

Reason for revert: b/226318737

Change-Id: Ie1cf0e79b3ac11b91e031a479898a54856020500
---
 core/sysprop.mk              | 3 +--
 tools/releasetools/common.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/sysprop.mk b/core/sysprop.mk
index 63574d01eb..43b8953569 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -501,11 +501,10 @@ $(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,\
-    $(RAMDISK_PARTITION_NAME),\
+    bootimage,\
     $(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\
     $(empty),\
     $(empty),\
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 1c29273bd8..9feb8af700 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -498,9 +498,9 @@ class BuildInfo(object):
   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.