From 9f4fdb3def9264a80e05e473ac67ddc19c1a6ef2 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 20 Nov 2015 13:03:24 -0800 Subject: Track name change from adb_main to adb_server_main. Change-Id: I835805348a9817c81639ad8471e3b49cae93c107 --- minadbd/adb_main.cpp | 2 +- recovery.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp index c968204b2..0694280cb 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/adb_main.cpp @@ -25,7 +25,7 @@ #include "adb_auth.h" #include "transport.h" -int adb_main(int is_daemon, int server_port, int /* reply_fd */) { +int adb_server_main(int is_daemon, int server_port, int /* reply_fd */) { adb_device_banner = "sideload"; signal(SIGPIPE, SIG_IGN); diff --git a/recovery.cpp b/recovery.cpp index 5f3bfca43..aaca3e0fb 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1015,7 +1015,7 @@ 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_main(0, DEFAULT_ADB_PORT, -1); + adb_server_main(0, DEFAULT_ADB_PORT, -1); return 0; } -- cgit v1.2.3