Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 477b8e05 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents d8f89107 8250d2cd

core/sysprop.mk

+1 −2
Original line number Diff line number Diff line
@@ -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),\

tools/releasetools/common.py

+2 −2
Original line number Diff line number Diff line
@@ -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.