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

Commit 881df39d authored by Yifan Hong's avatar Yifan Hong
Browse files

Add BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT. 

This variable indicates whether recovery resources are moved to
vendor_boot. If true:

- $OUT/recovery.img will not be built
- $OUT/recovery/root will be included in vendor_boot ramdisk

Bug: 156098440
Test: set to true and check output
Test: `m target-files-package` and manually inspect output
Change-Id: I56dda56bab7def1540f4fb506323e3e605620cd4
parent 63c5ca19

core/Makefile

+29 −3
Original line number Diff line number Diff line
@@ -162,11 +162,19 @@ endif 
$(call dist-for-goals,sdk,$(API_FINGERPRINT))



INSTALLED_RECOVERYIMAGE_TARGET :=

# Build recovery image if

# BUILDING_RECOVERY_IMAGE && !BOARD_USES_RECOVERY_AS_BOOT && !BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT.

# If BOARD_USES_RECOVERY_AS_BOOT is true, leave empty because INSTALLED_BOOTIMAGE_TARGET is built

#   with recovery resources.

# If BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is true, leave empty to build recovery resources

#   but not the final recovery image.

ifdef BUILDING_RECOVERY_IMAGE

ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

ifneq ($(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT),true)

INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img

endif

endif

endif



include $(BUILD_SYSTEM)/sysprop.mk
@@ -868,6 +876,12 @@ INSTALLED_BOOTIMAGE_TARGET := 
endif # BOARD_PREBUILT_BOOTIMAGE

endif # TARGET_NO_KERNEL



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

# declare recovery ramdisk files

ifeq ($(BUILDING_RECOVERY_IMAGE),true)

INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP := $(call intermediates-dir-for,PACKAGING,recovery)/ramdisk_files-timestamp

endif



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

# vendor boot image

ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
@@ -881,8 +895,14 @@ INTERNAL_VENDOR_RAMDISK_FILES := $(filter $(TARGET_VENDOR_RAMDISK_OUT)/%, \ 
    $(ALL_DEFAULT_INSTALLED_MODULES))



INTERNAL_VENDOR_RAMDISK_TARGET := $(call intermediates-dir-for,PACKAGING,vendor-boot)/vendor-ramdisk.cpio$(RAMDISK_EXT)



ifeq (true,$(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))

$(INTERNAL_VENDOR_RAMDISK_TARGET): $(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP)

$(INTERNAL_VENDOR_RAMDISK_TARGET): PRIVATE_ADDITIONAL_DIR := $(TARGET_RECOVERY_ROOT_OUT)

endif



$(INTERNAL_VENDOR_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_VENDOR_RAMDISK_FILES) | $(COMPRESSION_COMMAND_DEPS)

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_VENDOR_RAMDISK_OUT) | $(COMPRESSION_COMMAND) > $@

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_VENDOR_RAMDISK_OUT) $(PRIVATE_ADDITIONAL_DIR) | $(COMPRESSION_COMMAND) > $@



ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG

  INTERNAL_VENDOR_BOOTIMAGE_ARGS += --dtb $(INSTALLED_DTBIMAGE_TARGET)
@@ -1897,7 +1917,7 @@ ifndef BOARD_RECOVERY_MKBOOTIMG_ARGS 
  BOARD_RECOVERY_MKBOOTIMG_ARGS := $(BOARD_MKBOOTIMG_ARGS)

endif



$(recovery_ramdisk): $(MKBOOTFS) $(COMPRESSION_COMMAND_DEPS) \

$(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP): $(MKBOOTFS) $(COMPRESSION_COMMAND_DEPS) \

	    $(INTERNAL_ROOT_FILES) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INTERNAL_RECOVERYIMAGE_FILES) \
@@ -1933,6 +1953,9 @@ $(recovery_ramdisk): $(MKBOOTFS) $(COMPRESSION_COMMAND_DEPS) \ 
	  cp -f $(recovery_wipe) $(TARGET_RECOVERY_ROOT_OUT)/system/etc/recovery.wipe)

	ln -sf prop.default $(TARGET_RECOVERY_ROOT_OUT)/default.prop

	$(BOARD_RECOVERY_IMAGE_PREPARE)

	$(hide) touch $@



$(recovery_ramdisk): $(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP)

	$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) | $(COMPRESSION_COMMAND) > $(recovery_ramdisk)



# $(1): output file
@@ -4214,8 +4237,11 @@ endif 
$(BUILT_TARGET_FILES_PACKAGE): $(updater_dep)



# If we are using recovery as boot, output recovery files to BOOT/.

# If we are moving recovery resources to vendor_boot, output recovery files to VENDOR_BOOT/.

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_OUT := BOOT

else ifeq ($(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT),true)

$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_OUT := VENDOR_BOOT

else

$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_OUT := RECOVERY

endif
@@ -4425,7 +4451,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	@echo "Package target files: $@"

	$(hide) rm -rf $@ $@.list $(zip_root)

	$(hide) mkdir -p $(dir $@) $(zip_root)

ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))

ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_BOOT))$(filter true,$(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT)))

	@# Components of the recovery image

	$(hide) mkdir -p $(zip_root)/$(PRIVATE_RECOVERY_OUT)

	$(hide) $(call package_files-copy-root, \

core/board_config.mk

+22 −0
Original line number Diff line number Diff line
@@ -103,9 +103,12 @@ _board_strip_readonly_list += \ 
#   Update mechanism of the boot image is not enforced by this variable.

# - BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE controls whether the recovery image

#   contains a kernel or not.

# - BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT controls whether ramdisk

#   recovery resources are built to vendor_boot.

_board_strip_readonly_list += \

  BOARD_USES_GENERIC_KERNEL_IMAGE \

  BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE \

  BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT \



_build_broken_var_list := \

  BUILD_BROKEN_DUP_RULES \
@@ -374,6 +377,9 @@ BUILDING_RECOVERY_IMAGE := 
ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),)

  ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

    BUILDING_RECOVERY_IMAGE := true

  else ifeq ($(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT),true)

    # Set to true to build recovery resources for vendor_boot

    BUILDING_RECOVERY_IMAGE := true

  else ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE

    ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))

      BUILDING_RECOVERY_IMAGE := true
@@ -761,3 +767,19 @@ ifndef BUILDING_RECOVERY_IMAGE 
    $(error Should not set BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE if not building recovery image)

  endif

endif



ifndef BUILDING_VENDOR_BOOT_IMAGE

  ifeq (true,$(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))

    $(error Should not set BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT if not building vendor_boot image)

  endif

endif



# If BOARD_USES_GENERIC_KERNEL_IMAGE is set, BOARD_USES_RECOVERY_AS_BOOT must not be set.

# Devices without a dedicated recovery partition uses BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT to

# build recovery into vendor_boot.

ifeq (true,$(BOARD_USES_GENERIC_KERNEL_IMAGE))

  ifeq (true,$(BOARD_USES_RECOVERY_AS_BOOT))

    $(error BOARD_USES_RECOVERY_AS_BOOT cannot be true if BOARD_USES_GENERIC_KERNEL_IMAGE is true. \

      Use BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT instead)

  endif

endif