From 411fac84d67970b0c06c67c7ab41224166564e3b Mon Sep 17 00:00:00 2001
From: Yi-Yo Chiang <yochiang@google.com>
Date: Tue, 15 Mar 2022 17:40:23 +0800
Subject: [PATCH] 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
---
 core/sysprop.mk              | 3 ++-
 tools/releasetools/common.py | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/sysprop.mk b/core/sysprop.mk
index 43b8953569..63574d01eb 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -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),\
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 9feb8af700..1c29273bd8 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 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.