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

* commit 'cfe46542e424e5e2159cf5212f72ae8f53c589a6':
  Fix build following adb change.
This commit is contained in:
Dan Albert
2015-05-08 18:14:53 +00:00
committed by Android Git Automerger
+1 -5
View File
@@ -26,13 +26,9 @@
#include "adb.h" #include "adb.h"
#include "transport.h" #include "transport.h"
int adb_main(int is_daemon, int server_port) int adb_main(int is_daemon, int server_port) {
{
atexit(usb_cleanup);
adb_device_banner = "sideload"; adb_device_banner = "sideload";
// No SIGCHLD. Let the service subproc handle its children.
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
init_transport_registration(); init_transport_registration();