StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Rename init_boot properties to ro.init_boot.*"

Browse Source 
This reverts commit 411fac84d6.

Reason for revert: b/226318737

Change-Id: Ie1cf0e79b3ac11b91e031a479898a54856020500
This commit is contained in:
Kelvin Zhang
2022-03-23 19:46:09 +00:00
parent 411fac84d6
commit 8250d2cd9e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/sysprop.mk
View File

@@ -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),\

4
tools/releasetools/common.py
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 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.