From cc08a90cab4b8e1a039ce96ff6d0124cd2c8824a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 8 May 2015 10:39:33 -0700 Subject: Fix build following adb change. Change-Id: I2e0fb7e880e205b0bca324ff53ffdb5df9e34baf --- minadbd/adb_main.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'minadbd/adb_main.cpp') diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp index f6e240108..0e65386c4 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/adb_main.cpp @@ -26,13 +26,9 @@ #include "adb.h" #include "transport.h" -int adb_main(int is_daemon, int server_port) -{ - atexit(usb_cleanup); - +int adb_main(int is_daemon, int server_port) { adb_device_banner = "sideload"; - // No SIGCHLD. Let the service subproc handle its children. signal(SIGPIPE, SIG_IGN); init_transport_registration(); -- cgit v1.2.3 From 9813f5ba57fe7d90d45cb1c2b6f65920ce580e72 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 23 Jun 2015 11:12:58 -0700 Subject: Allow sideloading without authentication. Bug: http://b/22025550 Change-Id: I20f09ae442536f924f19ede0abf6a2bcc0a5cedf --- minadbd/adb_main.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'minadbd/adb_main.cpp') diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp index 0e65386c4..724f39c1d 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/adb_main.cpp @@ -19,11 +19,12 @@ #include #include -#define TRACE_TAG TRACE_ADB +#define TRACE_TAG TRACE_ADB #include "sysdeps.h" #include "adb.h" +#include "adb_auth.h" #include "transport.h" int adb_main(int is_daemon, int server_port) { @@ -31,6 +32,9 @@ int adb_main(int is_daemon, int server_port) { signal(SIGPIPE, SIG_IGN); + // We can't require authentication for sideloading. http://b/22025550. + auth_required = false; + init_transport_registration(); usb_init(); -- cgit v1.2.3 From faa75006af4f5ff5b189a80c8a6666ff88787e42 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 7 Aug 2015 13:21:06 -0700 Subject: Fix recovery image build. A recent adb cleanup changed the signature of adb_main. Change-Id: I98d084f999966f1a7aa94c63e9ed996b3375096d --- minadbd/adb_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minadbd/adb_main.cpp') 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); -- cgit v1.2.3 From 7c913e5faa1f3aa226c8de61cdc24e9be26ac422 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 23 Sep 2015 16:03:11 -0700 Subject: minadbd: move from D() to VLOG(). Change-Id: I542e2ae8f5ef18b2d6b3dbc1888b3ce1e02a7404 --- minadbd/adb_main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'minadbd/adb_main.cpp') diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp index 514f19699..c968204b2 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/adb_main.cpp @@ -19,8 +19,6 @@ #include #include -#define TRACE_TAG TRACE_ADB - #include "sysdeps.h" #include "adb.h" @@ -38,7 +36,7 @@ int adb_main(int is_daemon, int server_port, int /* reply_fd */) { init_transport_registration(); usb_init(); - D("Event loop starting\n"); + VLOG(ADB) << "Event loop starting"; fdevent_loop(); return 0; -- cgit v1.2.3 From 9f4fdb3def9264a80e05e473ac67ddc19c1a6ef2 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 20 Nov 2015 13:03:24 -0800 Subject: Track name change from adb_main to adb_server_main. Change-Id: I835805348a9817c81639ad8471e3b49cae93c107 --- minadbd/adb_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minadbd/adb_main.cpp') diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp index c968204b2..0694280cb 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/adb_main.cpp @@ -25,7 +25,7 @@ #include "adb_auth.h" #include "transport.h" -int adb_main(int is_daemon, int server_port, int /* reply_fd */) { +int adb_server_main(int is_daemon, int server_port, int /* reply_fd */) { adb_device_banner = "sideload"; signal(SIGPIPE, SIG_IGN); -- cgit v1.2.3