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

Commit 10500d0e authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp 

Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
parents 5cfcf91f 5cb4276e

core/Makefile

+40 −31
Original line number Diff line number Diff line
@@ -830,15 +830,8 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) 
	@mkdir -p $(dir $@)

	java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@



$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(recovery_binary) \

		$(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \

		$(INSTALLED_2NDBOOTLOADER_TARGET) \

		$(recovery_build_prop) $(recovery_resource_deps) \

		$(recovery_fstab) \

		$(RECOVERY_INSTALL_OTA_KEYS)

# $(1): output file

define build-recoveryimage-target

  @echo ----- Making recovery image ------

  $(hide) rm -rf $(TARGET_RECOVERY_OUT)

  $(hide) mkdir -p $(TARGET_RECOVERY_OUT)
@@ -864,17 +857,33 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ 
  $(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \

          > $(TARGET_RECOVERY_ROOT_OUT)/default.prop

  $(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)

	$(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY))

	$(BOOT_SIGNER) /recovery $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $@

endif

	$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))

	@echo ----- Made recovery image: $@ --------

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

  $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)),\

    $(BOOT_SIGNER) /recovery $(1) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1))

  $(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))

  @echo ----- Made recovery image: $(1) --------

endef



$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(recovery_binary) \

		$(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \

		$(INSTALLED_2NDBOOTLOADER_TARGET) \

		$(recovery_build_prop) $(recovery_resource_deps) \

		$(recovery_fstab) \

		$(RECOVERY_INSTALL_OTA_KEYS)

		$(call build-recoveryimage-target, $@)



$(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET)

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

	$(hide) find $(TARGET_RECOVERY_ROOT_OUT)/res -type f | sort | zip -0qrj $@ -@



.PHONY: recoveryimage-nodeps

recoveryimage-nodeps:

	@echo "make $@: ignoring dependencies"

	$(call build-recoveryimage-target, $(INSTALLED_RECOVERYIMAGE_TARGET))



else

INSTALLED_RECOVERYIMAGE_TARGET :=

RECOVERY_RESOURCE_ZIP :=

core/main.mk

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ dont_bother_goals := clean clobber dataclean installclean \ 
    cacheimage-nodeps \

    vendorimage-nodeps \

    ramdisk-nodeps \

    bootimage-nodeps

    bootimage-nodeps \

    recoveryimage-nodeps



ifneq ($(filter $(dont_bother_goals), $(MAKECMDGOALS)),)

dont_bother := true