Merge "Replace partition-specific toybox make module with soong modules" into main am: 7d90faa8b7 am: bc2895cb84

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3393539

Change-Id: I10c966d9d4984f4885839746e57d2a50fcfa53eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/shell_and_utilities/Android.bp b/shell_and_utilities/Android.bp
index 1f5c179..0a1f7c5 100644
--- a/shell_and_utilities/Android.bp
+++ b/shell_and_utilities/Android.bp
@@ -43,9 +43,10 @@
     required: [
         "sh.recovery",
         "toolbox.recovery",
-        "toybox.recovery",
+        "toybox_recovery",
         "ziptool.recovery",
     ],
+    recovery: true,
 }
 
 phony {