commit 8a4b7e5df17e0e3bd880206fd5636cfbd7223680
author Elliott Hughes <enh@google.com> Fri Nov 20 21:16:39 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 20 21:16:39 2015 +0000
tree 4db1b285036d36cc9b3f48b8721eb916e8ac5d0c
parent 897fa0779f7def3972c43c8530faf5baac8ae41c
parent cca6ca0953b56176ebb406fa89766e326f4d72ac

Merge "Track name change from adb_main to adb_server_main." am: ee5c87eea7
am: cca6ca0953

* commit 'cca6ca0953b56176ebb406fa89766e326f4d72ac':
  Track name change from adb_main to adb_server_main.

minadbd/adb_main.cpp

diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index c968204..0694280 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);

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index e348b84..55334db 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1037,7 +1037,7 @@
     // 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;
     }