tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Rename init_boot properties to ro.init_boot.*"" am: 477b8e0561 am: 5e294a92bf

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2039666

Change-Id: If815dd2ffd3addb569cf3bf5440eb61c4be1c07f
This commit is contained in:
Treehugger Robot 2022-03-24 04:35:07 +00:00 committed by Automerger Merge Worker
commit 7895babcad
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/sysprop.mk
View file

@ -519,11 +519,10 @@ $(eval $(call declare-1p-target,$(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET)))
# 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

@ -495,9 +495,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.