From 823d695d3a06ba0074cbc939dd100885cdc88c57 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Wed, 11 May 2022 11:25:49 -0700
Subject: [PATCH] Install new snapuserd_ramdisk stem

This installs snapuserd to /system/bin/snapuserd_ramdisk instead of
/system/bin/snapuserd

Test: th
Bug: 219841787
Change-Id: I517e251bf1f895b9de993ec7e5f57f11205172c8
---
 target/product/generic_ramdisk.mk                   |  2 +-
 target/product/virtual_ab_ota/android_t_baseline.mk | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/target/product/generic_ramdisk.mk b/target/product/generic_ramdisk.mk
index fb0370e923..5b58b0aa97 100644
--- a/target/product/generic_ramdisk.mk
+++ b/target/product/generic_ramdisk.mk
@@ -25,7 +25,7 @@ PRODUCT_PACKAGES += \
     e2fsck.ramdisk \
     fsck.f2fs.ramdisk \
     tune2fs.ramdisk \
-    snapuserd.ramdisk \
+    snapuserd_ramdisk \
 
 # Debug ramdisk
 PRODUCT_PACKAGES += \
diff --git a/target/product/virtual_ab_ota/android_t_baseline.mk b/target/product/virtual_ab_ota/android_t_baseline.mk
index 18e08e4e8e..716c8e0600 100644
--- a/target/product/virtual_ab_ota/android_t_baseline.mk
+++ b/target/product/virtual_ab_ota/android_t_baseline.mk
@@ -38,15 +38,3 @@ PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD ?= none
 PRODUCT_PACKAGES += \
     snapuserd \
 
-# 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
-