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

Commit 362b4041 authored by Josh Gao's avatar Josh Gao
Browse files

adb: fix darwin build break. 

Fix the following build breakage:

    system/core/adb/client/usb_osx.cpp:433:13: error: static declaration of 'usb_cleanup' follows non-static declaration
    static void usb_cleanup() NO_THREAD_SAFETY_ANALYSIS {
                ^
    system/core/adb/usb.h:48:5: note: previous declaration is here
        ADB_USB_INTERFACE(native::usb_handle*);

Bug: http://b/38203892
Test: mma on linux, darwin
Change-Id: I1c042e4d64ddcc0713f329202bc2037e590a9b4f
parent 44f6592b

adb/client/usb_dispatch.cpp

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ void usb_init() { 
void usb_cleanup() {

    if (should_use_libusb()) {

        libusb::usb_cleanup();

    } else {

        native::usb_cleanup();

    }

}

adb/client/usb_linux.cpp

+3 −0
Original line number Diff line number Diff line
@@ -598,4 +598,7 @@ void usb_init() { 


    std::thread(device_poll_thread).detach();

}



void usb_cleanup() {}



} // namespace native

adb/client/usb_osx.cpp

+1 −3
Original line number Diff line number Diff line
@@ -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();