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

Commit 828e92d6 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am a2ad467f: Merge "Support modules to be installed directly to recovery.img" 

* commit 'a2ad467f':
  Support modules to be installed directly to recovery.img
parents 0aef0966 a2ad467f

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -728,12 +728,14 @@ ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) 


INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img



INTERNAL_RECOVERYIMAGE_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \

    $(ALL_DEFAULT_INSTALLED_MODULES))



recovery_initrc := $(call include-path-for, recovery)/etc/init.rc

recovery_sepolicy := $(call intermediates-dir-for,ETC,sepolicy.recovery)/sepolicy.recovery

recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system

recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img

recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET)

recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery,,,$(TARGET_PREFER_32_BIT))/recovery

recovery_resources_common := $(call include-path-for, recovery)/res



# Set recovery_density to the density bucket of the device.
@@ -820,7 +822,6 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) 
# $(1): output file

define build-recoveryimage-target

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

  $(hide) rm -rf $(TARGET_RECOVERY_OUT)

  $(hide) mkdir -p $(TARGET_RECOVERY_OUT)

  $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp

  @echo Copying baseline ramdisk...
@@ -831,7 +832,6 @@ define build-recoveryimage-target 
  $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy

  $(hide) cp -f $(recovery_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/sepolicy

  $(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/

  $(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/

  $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res

  $(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/*

  $(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res
@@ -854,7 +854,7 @@ endef 
$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(recovery_binary) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \

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

		$(INSTALLED_2NDBOOTLOADER_TARGET) \

		$(recovery_build_prop) $(recovery_resource_deps) \

target/product/embedded.mk

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ PRODUCT_PACKAGES += \ 
    logwrapper \

    mkshrc \

    reboot \

    recovery \

    service \

    servicemanager \

    sh \