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

Commit 3854ebcc authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Add <ramdisk>/system/etc/ramdisk/build.prop." am: c75a3c54 

Original change: https://android-review.googlesource.com/c/platform/build/+/1455496

Change-Id: Icffb13a42d02eb19f707e7df1825e91e37f71c1e
parents 5c3f09cb c75a3c54

core/Makefile

+10 −0
Original line number Original line Diff line number Diff line
@@ -1851,6 +1851,15 @@ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \ 
	$(hide) cat $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET) >> $@

	$(hide) cat $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET) >> $@

	$(call append-recovery-ui-properties,$(PRIVATE_RECOVERY_UI_PROPERTIES),$@)

	$(call append-recovery-ui-properties,$(PRIVATE_RECOVERY_UI_PROPERTIES),$@)





# Only install boot/etc/build.prop to recovery image on recovery_as_boot.

# On device with dedicated recovery partition, the file should come from the boot

# ramdisk.

ifeq (true,$(BOARD_USES_RECOVERY_AS_BOOT))

INSTALLED_RECOVERY_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RECOVERY_ROOT_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH)

$(INSTALLED_RECOVERY_RAMDISK_BUILD_PROP_TARGET): $(INSTALLED_RAMDISK_BUILD_PROP_TARGET)

	$(copy-file-to-target)

endif



ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

  INTERNAL_RECOVERYIMAGE_ARGS := --ramdisk $(recovery_ramdisk)

  INTERNAL_RECOVERYIMAGE_ARGS := --ramdisk $(recovery_ramdisk)

ifdef GENERIC_KERNEL_CMDLINE

ifdef GENERIC_KERNEL_CMDLINE
@@ -1895,6 +1904,7 @@ $(recovery_ramdisk): $(MKBOOTFS) $(COMPRESSION_COMMAND_DEPS) \ 
	    $(recovery_sepolicy) \

	    $(recovery_sepolicy) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \

	    $(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \

	    $(INSTALLED_RECOVERY_RAMDISK_BUILD_PROP_TARGET) \

	    $(recovery_resource_deps) \

	    $(recovery_resource_deps) \

	    $(recovery_fstab)

	    $(recovery_fstab)

	# Making recovery image

	# Making recovery image

core/main.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -1745,6 +1745,7 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
    $(INSTALLED_PRODUCT_BUILD_PROP_TARGET):build.prop-product \

    $(INSTALLED_PRODUCT_BUILD_PROP_TARGET):build.prop-product \

    $(INSTALLED_ODM_BUILD_PROP_TARGET):build.prop-odm \

    $(INSTALLED_ODM_BUILD_PROP_TARGET):build.prop-odm \

    $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET):build.prop-system_ext \

    $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET):build.prop-system_ext \

    $(INSTALLED_RAMDISK_BUILD_PROP_TARGET):build.prop-ramdisk \

    $(BUILT_TARGET_FILES_PACKAGE) \

    $(BUILT_TARGET_FILES_PACKAGE) \

    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

    $(INSTALLED_MISC_INFO_TARGET) \

    $(INSTALLED_MISC_INFO_TARGET) \

core/sysprop.mk

+10 −0
Original line number Original line Diff line number Diff line
@@ -429,3 +429,13 @@ $(eval $(call build-properties,\ 
    $(_prop_files_),\

    $(_prop_files_),\

    $(_prop_vars_),\

    $(_prop_vars_),\

    $(empty)))

    $(empty)))



# ----------------------------------------------------------------

# ramdisk/boot/etc/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)

$(eval $(call build-properties,\

    bootimage,\

    $(INSTALLED_RAMDISK_BUILD_PROP_TARGET)))