commit 5f4a09a54eed55de89e194780214a2acfd2cb431
author Andreas Gampe <agampe@google.com> Mon Sep 28 13:16:33 2015 -0700
committer Andreas Gampe <agampe@google.com> Mon Oct 05 08:57:32 2015 -0700
tree 20194da9f2963a98f0265a25172aa9a61b52c2c8
parent 1aba494df441c31836e5b7d4d8e408420a93cb8d

ART: Add CheckJNI lock checking

JNI MonitorEnter and MonitorExit have similar rules to structured
locking. Count locks in CheckJNI mode.

Bug: 23502994
Change-Id: Ie3f53d3aa669a6bd0c7153c50c168116b43764d9

runtime/class_linker.h

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 739403f..7f3e938 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -883,6 +883,7 @@
   friend class ImageWriter;  // for GetClassRoots
   friend class ImageDumper;  // for FindOpenedOatFileFromOatLocation
   friend class JniCompilerTest;  // for GetRuntimeQuickGenericJniStub
+  friend class JniInternalTest;  // for GetRuntimeQuickGenericJniStub
   ART_FRIEND_TEST(mirror::DexCacheTest, Open);  // for AllocDexCache
 
   DISALLOW_COPY_AND_ASSIGN(ClassLinker);