commit c59d10d92e6ba5a995ae2a29f934b2f565b26efe
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 06 20:16:32 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 06 20:16:32 2024 +0000
tree f4f1599f5a1b8bf13b767b0c490ebf0f0241e111
parent 6a734e6b72c8a30b88b1d1b99a8427683e458e14
parent e74001be6f8e2940fa235672ed7b7fdbee062c06

Merge "Define toolbox.recovery" into main am: e74001be6f

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

Change-Id: Ibfc87c4de3f2edebbba7667a78b7615ccf86c5e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

toolbox/Android.bp

diff --git a/toolbox/Android.bp b/toolbox/Android.bp
index 120cc6e..3142542 100644
--- a/toolbox/Android.bp
+++ b/toolbox/Android.bp
@@ -68,11 +68,17 @@
 cc_binary {
     name: "toolbox",
     defaults: ["toolbox_binary_defaults"],
-    recovery_available: true,
     vendor_ramdisk_available: true,
 }
 
 cc_binary {
+    name: "toolbox.recovery",
+    defaults: ["toolbox_binary_defaults"],
+    recovery: true,
+    stem: "toolbox",
+}
+
+cc_binary {
     name: "toolbox_vendor",
     stem: "toolbox",
     vendor: true,