From faa75006af4f5ff5b189a80c8a6666ff88787e42 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 7 Aug 2015 13:21:06 -0700 Subject: [PATCH] Fix recovery image build. A recent adb cleanup changed the signature of adb_main. Change-Id: I98d084f999966f1a7aa94c63e9ed996b3375096d --- 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 724f39c1..514f1969 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/adb_main.cpp @@ -27,7 +27,7 @@ #include "adb_auth.h" #include "transport.h" -int adb_main(int is_daemon, int server_port) { +int adb_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 8123903a..515470f9 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -942,7 +942,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); + adb_main(0, DEFAULT_ADB_PORT, -1); return 0; }