commit 1fdb6963ddc8e82214926bfa732987483b86ab97
author Yi Kong <yikong@google.com> Thu Nov 19 13:58:04 2015 +0000
committer Narayan Kamath <narayan@google.com> Mon Nov 23 10:54:51 2015 +0000
tree 6e9c541483dc0d135c88764656866b8ccf5ead0c
parent 0871cd77724873c9a8c58f04168e360afd787ab0

Fix jni_internal_test

by loading correct dependent classes for OpenJDK DirectByteBuffer.

Bug: 25810235

(cherry picked from commit 0cef3d3e85e7a992fe5adb2c853233d6f5ce3a63)

Change-Id: I4b4c1ac164d4710df544d68b508af5da7f18e124

runtime/jni_internal_test.cc

diff --git a/runtime/jni_internal_test.cc b/runtime/jni_internal_test.cc
index 649df5f..7278624 100644
--- a/runtime/jni_internal_test.cc
+++ b/runtime/jni_internal_test.cc
@@ -2089,8 +2089,7 @@
   MakeExecutable(nullptr, "java.lang.Class");
   MakeExecutable(nullptr, "java.lang.Object");
   MakeExecutable(nullptr, "java.nio.DirectByteBuffer");
-  MakeExecutable(nullptr, "java.nio.MemoryBlock");
-  MakeExecutable(nullptr, "java.nio.MemoryBlock$UnmanagedBlock");
+  MakeExecutable(nullptr, "java.nio.Bits");
   MakeExecutable(nullptr, "java.nio.MappedByteBuffer");
   MakeExecutable(nullptr, "java.nio.ByteBuffer");
   MakeExecutable(nullptr, "java.nio.Buffer");