commit 254105b1ba928a912c5bbc5d58b511d93ddd709a
author Josh Gao <jmgao@google.com> Thu May 04 23:15:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 23:15:15 2017 +0000
tree 813f916076d77304f052d64652937ab8b3f761e0
parent dc51b14d320f0b7966a10121f70b4e2558865a02
parent 9c3e7328e51ad8b87f9e0086e16bab8651607934

Merge "adb: make darwin build with thread safety analysis." am: 971e6585a6
am: b80ef5e6fd

Change-Id: I0c5e3ccdba1df55ae87ec32a7b88a0b499cebd09

adb/client/usb_osx.cpp

diff --git a/adb/client/usb_osx.cpp b/adb/client/usb_osx.cpp
index e4a543b..e366754 100644
--- a/adb/client/usb_osx.cpp
+++ b/adb/client/usb_osx.cpp
@@ -38,6 +38,7 @@
 
 #include <android-base/logging.h>
 #include <android-base/stringprintf.h>
+#include <android-base/thread_annotations.h>
 
 #include "adb.h"
 #include "transport.h"
@@ -429,7 +430,7 @@
     VLOG(USB) << "RunLoopThread done";
 }
 
-static void usb_cleanup() {
+static 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();