commit b139b6d3833cd6a90f345204202ec57ff277c088
author Hiroshi Yamauchi <yamauchi@google.com> Tue Feb 28 15:01:23 2017 -0800
committer Hiroshi Yamauchi <yamauchi@google.com> Tue Mar 07 14:38:30 2017 -0800
tree b7e264fc3c10c6f040d6d887177ab58a82201e88
parent 7ba6ed786aa21257cfeefb917157d7d4768b9501

Revert "Add jdwp event_list_lock_ to expected_mutexes_on_weak_ref_access_."

This reverts commit 35b456a05af864da6580dd01c033efb0ed3e3e44.

Will be superceded by aog/346324.

Bug: 35360959
Test: test-art-host.
Test: jdwp test.

Change-Id: I325003cb85b29c0245de6ba86b719b51201a840c

runtime/base/mutex.h

diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index c59664b..9b6938f 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -630,12 +630,8 @@
   // Guards shutdown of the runtime.
   static Mutex* runtime_shutdown_lock_ ACQUIRED_AFTER(heap_bitmap_lock_);
 
-  static Mutex* jdwp_event_list_lock_
-      ACQUIRED_AFTER(runtime_shutdown_lock_)
-      ACQUIRED_BEFORE(breakpoint_lock_);
-
   // Guards background profiler global state.
-  static Mutex* profiler_lock_ ACQUIRED_AFTER(jdwp_event_list_lock_);
+  static Mutex* profiler_lock_ ACQUIRED_AFTER(runtime_shutdown_lock_);
 
   // Guards trace (ie traceview) requests.
   static Mutex* trace_lock_ ACQUIRED_AFTER(profiler_lock_);