Merge "Rename init_boot properties to ro.init_boot.*"
This commit is contained in:
commit
e5ed34824f
2 changed files with 4 additions and 3 deletions
|
@ -519,10 +519,11 @@ $(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,\
|
||||
bootimage,\
|
||||
$(RAMDISK_PARTITION_NAME),\
|
||||
$(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\
|
||||
$(empty),\
|
||||
$(empty),\
|
||||
|
|
|
@ -494,9 +494,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.
|
||||
|
|
Loading…
Reference in a new issue