commit 7fbc4a59ba2e60d869313d7961662430df83b2cb
author Andreas Gampe <agampe@google.com> Wed Nov 28 08:26:47 2018 -0800
committer Andreas Gampe <agampe@google.com> Thu Dec 06 11:37:19 2018 -0800
tree 59520285df8d2075412ddc566a0d4d96d4c7e109
parent 7cc45fd1dbcf5704e442d0443e437aa2ae3fe21b

ART: Move to using locks.h instead of mutex.h

When only annotating lock requirements, use locks.h.

Bug: 119869270
Test: mmma art
Change-Id: I1608b03254712feff0072ebad012c3af0cc3dda4

runtime/obj_ptr.h

diff --git a/runtime/obj_ptr.h b/runtime/obj_ptr.h
index efbb66f..9e2ee29 100644
--- a/runtime/obj_ptr.h
+++ b/runtime/obj_ptr.h
@@ -21,8 +21,8 @@
 #include <type_traits>
 
 #include "base/globals.h"
+#include "base/locks.h"  // For Locks::mutator_lock_.
 #include "base/macros.h"
-#include "base/mutex.h"  // For Locks::mutator_lock_.
 
 // Always inline ObjPtr methods even in debug builds.
 #define OBJPTR_INLINE __attribute__ ((always_inline))