diff options
| author | Elliott Hughes <enh@google.com> | 2015-11-20 22:16:39 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-20 22:16:39 +0100 |
| commit | 8a4b7e5df17e0e3bd880206fd5636cfbd7223680 (patch) | |
| tree | 4db1b285036d36cc9b3f48b8721eb916e8ac5d0c | |
| parent | Add slot_suffix field to struct bootloader_message. am: 846c094fee (diff) | |
| parent | Merge "Track name change from adb_main to adb_server_main." (diff) | |
| download | android_bootable_recovery-8a4b7e5df17e0e3bd880206fd5636cfbd7223680.tar android_bootable_recovery-8a4b7e5df17e0e3bd880206fd5636cfbd7223680.tar.gz android_bootable_recovery-8a4b7e5df17e0e3bd880206fd5636cfbd7223680.tar.bz2 android_bootable_recovery-8a4b7e5df17e0e3bd880206fd5636cfbd7223680.tar.lz android_bootable_recovery-8a4b7e5df17e0e3bd880206fd5636cfbd7223680.tar.xz android_bootable_recovery-8a4b7e5df17e0e3bd880206fd5636cfbd7223680.tar.zst android_bootable_recovery-8a4b7e5df17e0e3bd880206fd5636cfbd7223680.zip | |
| -rw-r--r-- | minadbd/adb_main.cpp | 2 | ||||
| -rw-r--r-- | 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 e348b84d0..55334db32 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1037,7 +1037,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; } |