ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: fix darwin build."

Browse source
This commit is contained in:
Josh Gao 2017-01-26 22:03:14 +00:00 • committed by Gerrit Code Review
commit dd87331974
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/client/usb_osx.cpp
View file

@ -44,6 +44,7 @@
using namespace std::chrono_literals; using namespace std::chrono_literals;
namespace native {
struct usb_handle struct usb_handle
{ {
UInt8 bulkIn; UInt8 bulkIn;
@ -298,7 +299,8 @@ AndroidInterfaceAdded(io_iterator_t iterator)
usb_handle* handle_p = handle.get(); usb_handle* handle_p = handle.get();
VLOG(USB) << "Add usb device " << serial; VLOG(USB) << "Add usb device " << serial;
AddDevice(std::move(handle)); 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); std::lock_guard<std::mutex> lock_guard(g_usb_handles_mutex);
usb_kick_locked(handle); usb_kick_locked(handle);
} }
} // namespace native