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

Commit 1c8ecd77 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge changes I35f8843e,Icd2a94f8,I6c20f3b3 

am: 1f1a0009

Change-Id: I13b66d553915bf4bdada12e854214d3232150423
parents bb15e257 1f1a0009

adb/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ cc_test_host { 
    target: {

        windows: {

            enabled: true,

            ldflags: ["-municode"],

            shared_libs: ["AdbWinApi"],

        },

    },

adb/sysdeps_test.cpp

+19 −2
Original line number Diff line number Diff line
@@ -25,6 +25,21 @@ 
#include "sysdeps.h"

#include "sysdeps/chrono.h"



#if defined(_WIN32)

#include <windows.h>

static bool IsWine() {

    HMODULE ntdll = GetModuleHandleW(L"ntdll.dll");

    if (!ntdll) {

        return false;

    }

    return GetProcAddress(ntdll, "wine_get_version") != nullptr;

}

#else

static bool IsWine() {

    return false;

}

#endif



TEST(sysdeps_socketpair, smoke) {

    int fds[2];

    ASSERT_EQ(0, adb_socketpair(fds)) << strerror(errno);
@@ -182,9 +197,11 @@ TEST_F(sysdeps_poll, disconnect) { 


    EXPECT_EQ(1, adb_poll(&pfd, 1, 100));



    if (!IsWine()) {

        // Linux returns POLLIN | POLLHUP, Windows returns just POLLHUP.

        EXPECT_EQ(POLLHUP, pfd.revents & POLLHUP);

    }

}



TEST_F(sysdeps_poll, fd_count) {

    // https://code.google.com/p/android/issues/detail?id=12141

adb/sysdeps_win32.cpp

+0 −9
Original line number Diff line number Diff line
@@ -610,15 +610,6 @@ static void _fh_socket_init(FH f) { 


static int _fh_socket_close(FH f) {

    if (f->fh_socket != INVALID_SOCKET) {

        /* gently tell any peer that we're closing the socket */

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

            // If the socket is not connected, this returns an error. We want to

            // minimize logging spam, so don't log these errors for now.

#if 0

            D("socket shutdown failed: %s",

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

#endif

        }

        if (closesocket(f->fh_socket) == SOCKET_ERROR) {

            // Don't set errno here, since adb_close will ignore it.

            const DWORD err = WSAGetLastError();