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

Commit 2371a7d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Support shared library in recovery mode"

parents 82de4206 53acaeab

core/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -1396,10 +1396,6 @@ define build-recoveryimage-target 
          >> $(TARGET_RECOVERY_ROOT_OUT)/prop.default

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

  $(BOARD_RECOVERY_IMAGE_PREPARE)

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

    $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root; \

            rm -rf $(TARGET_RECOVERY_ROOT_OUT)/system; \

            ln -sf /system_root/system $(TARGET_RECOVERY_ROOT_OUT)/system) # Mount the system_root_image to /system_root and symlink /system.

  $(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)

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

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

target/product/base.mk

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ PRODUCT_PACKAGES += \ 
    javax.obex \

    keystore \

    ld.config.txt \

    ld.config.recovery.txt \

    ld.mc \

    libaaudio \

    libandroid \

target/product/embedded.mk

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

    libutils \

    linker \

    linker.recovery \

    lmkd \

    logcat \

    lshal \