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

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

Merge "adb: fix darwin build." am: dd873319 am: 7257f2ad 

am: dd778187

Change-Id: I80de964da1c97316b321dc6a6204df36a28d26dc
parents bbaabe6b dd778187

adb/client/usb_osx.cpp

+4 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 


using namespace std::chrono_literals;



namespace native {

struct usb_handle

{

    UInt8 bulkIn;
@@ -298,7 +299,8 @@ AndroidInterfaceAdded(io_iterator_t iterator) 
        usb_handle* handle_p = handle.get();

        VLOG(USB) << "Add usb device " << serial;

        AddDevice(std::move(handle));

        register_usb_transport(handle_p, serial, devpath.c_str(), 1);

        register_usb_transport(reinterpret_cast<::usb_handle*>(handle_p), serial, devpath.c_str(),

                               1);

    }

}
@@ -558,3 +560,4 @@ void usb_kick(usb_handle *handle) { 
    std::lock_guard<std::mutex> lock_guard(g_usb_handles_mutex);

    usb_kick_locked(handle);

}

} // namespace native