From 8a7277df4127bd33dc0dd6f47d80d0591b95eb8d Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Wed, 23 Mar 2022 18:13:42 -0700 Subject: [PATCH] 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 --- target/product/virtual_ab_ota/android_t_baseline.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/target/product/virtual_ab_ota/android_t_baseline.mk b/target/product/virtual_ab_ota/android_t_baseline.mk index f2639b4bd8..18e08e4e8e 100644 --- a/target/product/virtual_ab_ota/android_t_baseline.mk +++ b/target/product/virtual_ab_ota/android_t_baseline.mk @@ -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