am 3128176e: Merge "Fix build following adb change."

* commit '3128176e7d8f5cee4afdff3b5fdcadbe66ef97af':
  Fix build following adb change.
This commit is contained in:
Dan Albert 2015-05-08 18:03:40 +00:00 committed by Android Git Automerger
commit cfe46542e4

View file

@ -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();