Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c86f668 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 80cd32ae: am 63feeaaa: Merge "Fix Windows adb build." 

* commit '80cd32ae':
  Fix Windows adb build.
parents 8118e3de 80cd32ae

adb/adb.c

+0 −8
Original line number Diff line number Diff line
@@ -542,14 +542,6 @@ void handle_packet(apacket *p, atransport *t) 
    put_apacket(p);

}



#if defined(_WIN32)

static BOOL WINAPI ctrlc_handler(DWORD type)

{

    exit(STATUS_CONTROL_C_EXIT);

    return TRUE;

}

#endif



#if ADB_HOST



int launch_server(int server_port)

adb/adb_listeners.c

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#include "adb_listeners.h"



#include <sys/socket.h>



#include "sysdeps.h"



int gListenAll = 0; /* Not static because it is used in commandline.c. */

adb/adb_main.c

+9 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <signal.h>

#include <stdio.h>

#include <stdlib.h>

#include <sys/prctl.h>



#include "adb.h"

#include "adb_auth.h"
@@ -29,6 +28,7 @@ 


#if !ADB_HOST

#include <getopt.h>

#include <sys/prctl.h>



#include "cutils/properties.h"

#include "private/android_filesystem_config.h"
@@ -42,6 +42,14 @@ static void adb_cleanup(void) 
    usb_cleanup();

}



#if defined(_WIN32)

static BOOL WINAPI ctrlc_handler(DWORD type)

{

    exit(STATUS_CONTROL_C_EXIT);

    return TRUE;

}

#endif



#if ADB_HOST

#ifdef WORKAROUND_BUG6558362

#include <sched.h>