commit 06689dc53d14ab0449c64c097d2937179f986873
author Elliott Hughes <enh@google.com> Fri Aug 07 20:24:21 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 07 20:24:21 2015 +0000
tree 8676aa4a471da11239baef3f07954ab6bf9911c6
parent 27c1ab2095f25253d0920eb6afe7cd2791a708dc
parent faa75006af4f5ff5b189a80c8a6666ff88787e42

Merge "Fix recovery image build."

minadbd/adb_main.cpp

diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index 724f39c..514f196 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);

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 8123903..515470f 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -942,7 +942,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);
+        adb_main(0, DEFAULT_ADB_PORT, -1);
         return 0;
     }