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

Commit 8614d018 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove recovery.id completely"

parents f64b664d 72b65abd

core/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img 
endif

endif



$(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop) $(INSTALLED_RECOVERYIMAGE_TARGET)

$(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop)

	@echo "Target build info: $@"

	$(hide) grep -v 'ro.product.first_api_level' $(intermediate_system_build_prop) > $@
@@ -1832,8 +1832,6 @@ ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG 
  INTERNAL_RECOVERYIMAGE_ARGS += --dtb $(INSTALLED_DTBIMAGE_TARGET)

endif



RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id



# $(1): output file

define build-recoveryimage-target

  # Making recovery image
@@ -1868,7 +1866,7 @@ define build-recoveryimage-target 
  $(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)

  $(if $(filter true,$(PRODUCT_SUPPORTS_VBOOT)), \

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1).unsigned, \

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1) --id > $(RECOVERYIMAGE_ID_FILE))

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1))

  $(if $(filter true,$(PRODUCT_SUPPORTS_BOOT_SIGNER)),\

    $(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\

      $(BOOT_SIGNER) /boot $(1) $(PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1),\