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

Merge "Rename init_boot properties to ro.init_boot.*" am: e5ed34824f am: f773aa245f

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

Change-Id: Ie684c49fb6048ad50fbe4ff1f5953ee3ec4f8cbb
This commit is contained in:
Yi-yo Chiang 2022-03-22 10:13:44 +00:00 committed by Automerger Merge Worker
commit c69d4ddf3d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/sysprop.mk
View file

@ -519,10 +519,11 @@ $(eval $(call declare-1p-target,$(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET)))
# ramdisk/boot/etc/build.prop # 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 RAMDISK_BUILD_PROP_REL_PATH := system/etc/ramdisk/build.prop
INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RAMDISK_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH) INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RAMDISK_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH)
$(eval $(call build-properties,\ $(eval $(call build-properties,\
bootimage,\ $(RAMDISK_PARTITION_NAME),\
$(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\ $(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\
$(empty),\ $(empty),\
$(empty),\ $(empty),\

4
tools/releasetools/common.py
View file

@ -494,9 +494,9 @@ class BuildInfo(object):
def GetPartitionBuildProp(self, prop, partition): def GetPartitionBuildProp(self, prop, partition):
"""Returns the inquired build property for the provided 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 # 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 # If provided a partition for this property, only look within that
# partition's build.prop. # partition's build.prop.