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

Merge "adb: fix darwin build break."

Browse source
This commit is contained in:
Josh Gao 2017-05-10 21:58:08 +00:00 • committed by Gerrit Code Review
commit a0661237e1
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() { void usb_cleanup() {
if (should_use_libusb()) { if (should_use_libusb()) {
libusb::usb_cleanup(); 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(); std::thread(device_poll_thread).detach();
} }
void usb_cleanup() {}
} // namespace native } // namespace native

4
adb/client/usb_osx.cpp
View file

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