adb: replace reboot service with exec of /system/bin/reboot.

Test: adb reboot
Test: adb reboot fastboot
Change-Id: Ia4146dde7ef3ae00a782dbe68aff166d63eabdb9

Former-commit-id: 2c356bb91ebf146489913cef713392987c3e811b

adb/Android.bp

@@ -428,11 +428,9 @@ cc_library {
                 "daemon/abb_service.cpp",
                 "daemon/framebuffer_service.cpp",
                 "daemon/mdns.cpp",
-                "daemon/reboot_service.cpp",
                 "daemon/restart_service.cpp",
             ],
             shared_libs: [
-                "libbootloader_message",
                 "libmdnssd",
                 "libselinux",
             ],
@@ -511,13 +509,15 @@ phony {
     name: "adbd_system_binaries",
     required: [
         "abb",
+        "reboot",
         "set-verity-state",
     ]
 }
 
 phony {
     name: "adbd_system_binaries_recovery",
     required: [
+        "reboot.recovery",
     ],
 }
 
@@ -616,7 +616,6 @@ cc_test {
     static_libs: [
         "libadbd",
         "libbase",
-        "libbootloader_message",
         "libcutils",
         "libcrypto_utils",
         "libcrypto_static",

adb/daemon/services.cpp

@@ -53,7 +53,6 @@
 
 #include "daemon/file_sync_service.h"
 #include "daemon/framebuffer_service.h"
-#include "daemon/reboot_service.h"
 #include "daemon/restart_service.h"
 #include "daemon/shell_service.h"
 
@@ -253,9 +252,9 @@ unique_fd daemon_service_to_fd(std::string_view name, atransport* transport) {
         cmd += name;
         return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);
     } else if (android::base::ConsumePrefix(&name, "reboot:")) {
-        std::string arg(name);
-        return create_service_thread("reboot",
-                                     std::bind(reboot_service, std::placeholders::_1, arg));
+        std::string cmd = "/system/bin/reboot ";
+        cmd += name;
+        return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);
     } else if (name.starts_with("root:")) {
         return create_service_thread("root", restart_root_service);
     } else if (name.starts_with("unroot:")) {

reboot/Android.bp

@@ -5,4 +5,5 @@ cc_binary {
     srcs: ["reboot.c"],
     shared_libs: ["libcutils"],
     cflags: ["-Werror"],
+    recovery_available: true,
 }