commit 4f3937ac74fc699140432cb34f8e1edfedc66d76
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 25 01:39:05 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 25 01:39:05 2022 +0000
tree 0278cb5bc3da0780451b3ce2df71c64f9a2d588a
parent e721764192cc07ca411bd5ef12f21126739b7e85
parent 8a7277df4127bd33dc0dd6f47d80d0591b95eb8d

Merge "Remove snapuserd from vendor ramdisk"

target/product/virtual_ab_ota/android_t_baseline.mk

diff --git a/target/product/virtual_ab_ota/android_t_baseline.mk b/target/product/virtual_ab_ota/android_t_baseline.mk
index f2639b4..18e08e4 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_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