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

Commit eed93f02 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Support shared library in recovery mode" am: 2371a7d6 

am: 1d46a339

Change-Id: I116ff08c5df560cf675be5d5fb82fdb835566979
parents d3228dc9 1d46a339

core/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -1398,10 +1398,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
@@ -72,6 +72,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 \