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

Commit 45562bfb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Iea2a3055,I6582cfc6 

* changes:
  adb: start building windows test again.
  adb: fix windows test build.
parents cdc553d0 f8a97c1f

adb/Android.bp

+17 −6
Original line number Diff line number Diff line
@@ -72,8 +72,17 @@ cc_defaults { 
                "-DUNICODE=1",

                "-D_UNICODE=1",



                // -std=gnu++14 doesn't set _GNU_SOURCE on Windows.

                // -std=gnu++11 doesn't set _GNU_SOURCE on Windows.

                "-D_GNU_SOURCE",



                // MinGW hides some things behind _POSIX_SOURCE.

                "-D_POSIX_SOURCE",

            ],



            host_ldlibs: [

                "-lws2_32",

                "-lgdi32",

                "-luserenv",

            ],

        },

    },
@@ -173,6 +182,13 @@ cc_test_host { 
        "libdiagnose_usb",

        "libusb",

    ],



    target: {

        windows: {

            enabled: true,

            shared_libs: ["AdbWinApi"],

        },

    },

}



cc_binary_host {
@@ -220,11 +236,6 @@ cc_binary_host { 
        windows: {

            enabled: true,

            ldflags: ["-municode"],

            host_ldlibs: [

                "-lws2_32",

                "-lgdi32",

            ],



            shared_libs: ["AdbWinApi"],

            required: [

                "AdbWinUsbApi",

adb/fdevent_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include "adb_io.h"

#include "fdevent_test.h"

#include "sysdeps/memory.h"



class FdHandler {

  public:

adb/sysdeps.h

+10 −14
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ extern int adb_creat(const char* path, int mode); 
extern int adb_read(int fd, void* buf, int len);

extern int adb_write(int fd, const void* buf, int len);

extern int adb_lseek(int fd, int pos, int where);

extern int  adb_shutdown(int  fd);

extern int adb_shutdown(int fd, int direction = SHUT_RDWR);

extern int adb_close(int fd);

extern int adb_register_socket(SOCKET s);
@@ -414,14 +414,10 @@ static __inline__ int adb_open( const char* pathname, int options ) 
#undef   open

#define  open    ___xxx_open



static __inline__ int  adb_shutdown(int fd)

{

    return shutdown(fd, SHUT_RDWR);

}

static __inline__ int  adb_shutdown(int fd, int direction)

{

static __inline__ int adb_shutdown(int fd, int direction = SHUT_RDWR) {

    return shutdown(fd, direction);

}



#undef   shutdown

#define  shutdown   ____xxx_shutdown

adb/sysdeps_win32.cpp

+4 −5
Original line number Diff line number Diff line
@@ -1011,8 +1011,7 @@ int adb_socket_get_local_port(int fd) { 
    return ntohs(reinterpret_cast<sockaddr_in*>(&addr_storage)->sin_port);

}



int  adb_shutdown(int  fd)

{

int adb_shutdown(int fd, int direction) {

    FH f = _fh_from_int(fd, __func__);



    if (!f || f->clazz != &_fh_socket_class) {
@@ -1022,7 +1021,7 @@ int adb_shutdown(int fd) 
    }



    D("adb_shutdown: %s", f->name);

    if (shutdown(f->fh_socket, SD_BOTH) == SOCKET_ERROR) {

    if (shutdown(f->fh_socket, direction) == SOCKET_ERROR) {

        const DWORD err = WSAGetLastError();

        D("socket shutdown fd %d failed: %s", fd,

          android::base::SystemErrorCodeToString(err).c_str());