summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-11-20 22:06:51 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-11-20 22:06:51 +0100
commitee5c87eea737e47ab38e19625a32ac2fc0057ddd (patch)
treea93dec03d3e318b61416b3a4394ef5b43e42a867
parentMerge "We can use fclose directly in std::unique_ptr." (diff)
parentTrack name change from adb_main to adb_server_main. (diff)
downloadandroid_bootable_recovery-ee5c87eea737e47ab38e19625a32ac2fc0057ddd.tar
android_bootable_recovery-ee5c87eea737e47ab38e19625a32ac2fc0057ddd.tar.gz
android_bootable_recovery-ee5c87eea737e47ab38e19625a32ac2fc0057ddd.tar.bz2
android_bootable_recovery-ee5c87eea737e47ab38e19625a32ac2fc0057ddd.tar.lz
android_bootable_recovery-ee5c87eea737e47ab38e19625a32ac2fc0057ddd.tar.xz
android_bootable_recovery-ee5c87eea737e47ab38e19625a32ac2fc0057ddd.tar.zst
android_bootable_recovery-ee5c87eea737e47ab38e19625a32ac2fc0057ddd.zip
-rw-r--r--minadbd/adb_main.cpp2
-rw-r--r--recovery.cpp2
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;
}