commit 6f6a9761910aadab8e8a972dd88949fdb0f73143
author Elliott Hughes <enh@google.com> Sat Aug 08 02:48:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 08 02:48:47 2015 +0000
tree bdd8221313613e4b514a17afa02f8fe7f567344d
parent 40dfee777c77212d0dda247ca9832801607bf5d3
parent 2496489cb4ec75f13b0d30f580332e74bf4a2fa8

am 2496489c: am a9390df6: am 06689dc5: Merge "Fix recovery image build."

* commit '2496489cb4ec75f13b0d30f580332e74bf4a2fa8':
  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;
     }