From 04a8218f09d342b3d0c4a67fc4df9ad805bc49cc Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Thu, 4 May 2017 15:58:01 -0700 Subject: [PATCH] adb: make darwin build with thread safety analysis. Test: mma on darwin Change-Id: I44dfc53fc381e60de83f3bc503691cdb8179ca91 --- adb/client/usb_osx.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adb/client/usb_osx.cpp b/adb/client/usb_osx.cpp index e4a543bba..e36675493 100644 --- a/adb/client/usb_osx.cpp +++ b/adb/client/usb_osx.cpp @@ -38,6 +38,7 @@ #include #include +#include #include "adb.h" #include "transport.h" @@ -429,7 +430,7 @@ static void RunLoopThread() { 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();