commit 2c356bb91ebf146489913cef713392987c3e811b
author Josh Gao <jmgao@google.com> Tue Oct 22 12:30:36 2019 -0700
committer Josh Gao <jmgao@google.com> Wed Oct 23 14:33:36 2019 -0700
tree 5f87f615a5efbf6b35dbc48fb14e0646907aa01b
parent f61f41494e5106dbbcddd568001485306bd32937

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

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

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index d79a97f..d14fe56 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -428,11 +428,9 @@
                 "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,6 +509,7 @@
     name: "adbd_system_binaries",
     required: [
         "abb",
+        "reboot",
         "set-verity-state",
     ]
 }
@@ -518,6 +517,7 @@
 phony {
     name: "adbd_system_binaries_recovery",
     required: [
+        "reboot.recovery",
     ],
 }
 
@@ -616,7 +616,6 @@
     static_libs: [
         "libadbd",
         "libbase",
-        "libbootloader_message",
         "libcutils",
         "libcrypto_utils",
         "libcrypto_static",