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

Commit 8a7277df authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Remove snapuserd from vendor ramdisk 

When BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is set,
snapuserd.recovery will be installed to vendor ramdisk, which we don't
want. To remove snapuserd from vendor ramdisk, remove
snapuserd.recovery. And only include it if dedicated recovery partition
is enabled. For non-dedicated recovery case, boot partition contains
snapuserd.

Test: th
Test: acloud create --local-image --local-instance, install OTA, reboot
Change-Id: Ib8173f68a1f43b736fe609977a36ad4851e0c367
parent bc8d61f1

target/product/virtual_ab_ota/android_t_baseline.mk

+12 −1
Original line number Diff line number Diff line
@@ -37,5 +37,16 @@ PRODUCT_VIRTUAL_AB_COMPRESSION := true 
PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD ?= none

PRODUCT_PACKAGES += \

    snapuserd \

    snapuserd.recovery \



# For dedicated recovery partitions, we need to include snapuserd

# For GKI devices, BOARD_USES_RECOVERY_AS_BOOT is empty, but

# so is BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT.

ifdef BUILDING_RECOVERY_IMAGE

ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

ifneq ($(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT),true)

PRODUCT_PACKAGES += \

    snapuserd.recovery

endif

endif

endif