From acb2a2fa4c415944a27539461ba3757f3edbb128 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 26 Aug 2016 18:24:34 -0700 Subject: minadbd: rename adb_server_main to minadbd_main. adb_server_main in adb refers to the adb server on the host, not adbd. Since there doesn't seem to be a good reason to reuse the declaration from adb's headers, give minadbd a main function of its own. Change-Id: I748f1a6822dc14c726cb73ef3b533c57a6615608 --- recovery.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recovery.cpp') diff --git a/recovery.cpp b/recovery.cpp index 45a6fe90c..9fbdd8c66 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -61,6 +61,7 @@ #include "fuse_sdcard_provider.h" #include "fuse_sideload.h" #include "install.h" +#include "minadbd/minadbd.h" #include "minui/minui.h" #include "minzip/DirUtil.h" #include "roots.h" @@ -1389,7 +1390,7 @@ int main(int argc, char **argv) { // only way recovery should be run with this argument is when it // starts a copy of itself from the apply_from_adb() function. if (argc == 2 && strcmp(argv[1], "--adbd") == 0) { - adb_server_main(0, DEFAULT_ADB_PORT, -1); + minadbd_main(); return 0; } -- cgit v1.2.3