summaryrefslogtreecommitdiffstats
path: root/minadbd/adb_main.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-08-07 23:13:05 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-07 23:13:05 +0200
commit2496489cb4ec75f13b0d30f580332e74bf4a2fa8 (patch)
treebdd8221313613e4b514a17afa02f8fe7f567344d /minadbd/adb_main.cpp
parentresolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp (diff)
parentam 06689dc5: Merge "Fix recovery image build." (diff)
downloadandroid_bootable_recovery-2496489cb4ec75f13b0d30f580332e74bf4a2fa8.tar
android_bootable_recovery-2496489cb4ec75f13b0d30f580332e74bf4a2fa8.tar.gz
android_bootable_recovery-2496489cb4ec75f13b0d30f580332e74bf4a2fa8.tar.bz2
android_bootable_recovery-2496489cb4ec75f13b0d30f580332e74bf4a2fa8.tar.lz
android_bootable_recovery-2496489cb4ec75f13b0d30f580332e74bf4a2fa8.tar.xz
android_bootable_recovery-2496489cb4ec75f13b0d30f580332e74bf4a2fa8.tar.zst
android_bootable_recovery-2496489cb4ec75f13b0d30f580332e74bf4a2fa8.zip
Diffstat (limited to 'minadbd/adb_main.cpp')
-rw-r--r--minadbd/adb_main.cpp2
1 files changed, 1 insertions, 1 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);