openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adb: fix darwin build break." am: a0661237e1 am: 8016a0aa11 

am: 40866ccfc0

Change-Id: I5e3b7fab5bb7c3428a2dfe14ca43a54fb62358b8
This commit is contained in:
Josh Gao 2017-05-10 22:39:13 +00:00 committed by android-build-merger
parent 9deb8140bf 40866ccfc0
commit 3521f70220
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adb/client/usb_dispatch.cpp
View File

@ -30,6 +30,8 @@ void usb_init() {
void usb_cleanup() {
if (should_use_libusb()) {
libusb::usb_cleanup();
} else {
native::usb_cleanup();
}
}

3
adb/client/usb_linux.cpp
View File

@ -598,4 +598,7 @@ void usb_init() {
std::thread(device_poll_thread).detach();
}
void usb_cleanup() {}
} // namespace native

4
adb/client/usb_osx.cpp
View File

@ -430,7 +430,7 @@ static void RunLoopThread() {
VLOG(USB) << "RunLoopThread done";
}
static void usb_cleanup() NO_THREAD_SAFETY_ANALYSIS {
void usb_cleanup() NO_THREAD_SAFETY_ANALYSIS {
VLOG(USB) << "usb_cleanup";
// Wait until usb operations in RunLoopThread finish, and prevent further operations.
operate_device_lock.lock();
@ -440,8 +440,6 @@ static void usb_cleanup() NO_THREAD_SAFETY_ANALYSIS {
void usb_init() {
static bool initialized = false;
if (!initialized) {
atexit(usb_cleanup);
usb_inited_flag = false;
std::thread(RunLoopThread).detach();