summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-08-07 23:17:02 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-07 23:17:02 +0200
commit8fa0007a3eb59174f7c2fbf40a2a972dfb344531 (patch)
tree41d6de6f36786959228c431388612b2846b3ceb6
parentresolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp (diff)
parentam 06689dc5: Merge "Fix recovery image build." (diff)
downloadandroid_bootable_recovery-8fa0007a3eb59174f7c2fbf40a2a972dfb344531.tar
android_bootable_recovery-8fa0007a3eb59174f7c2fbf40a2a972dfb344531.tar.gz
android_bootable_recovery-8fa0007a3eb59174f7c2fbf40a2a972dfb344531.tar.bz2
android_bootable_recovery-8fa0007a3eb59174f7c2fbf40a2a972dfb344531.tar.lz
android_bootable_recovery-8fa0007a3eb59174f7c2fbf40a2a972dfb344531.tar.xz
android_bootable_recovery-8fa0007a3eb59174f7c2fbf40a2a972dfb344531.tar.zst
android_bootable_recovery-8fa0007a3eb59174f7c2fbf40a2a972dfb344531.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 724f39c1d..514f19699 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 8123903ae..515470f96 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;
}