commit 9ff518dd931c23bb7c4d7e3dc831234d02e6013d
author Elliott Hughes <enh@google.com> Wed Jul 31 11:04:21 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 31 11:04:21 2013 -0700
tree cfdd730fb402580c006995d5694528fb7b02d8f9
parent abbd2ea62e490d60a0bf680e7b110a53a8c910ed
parent 58de514b160674a483bcb912d367072c7354cc1e

am 58de514b: Merge "Fix Class.getDex."

* commit '58de514b160674a483bcb912d367072c7354cc1e':
  Fix Class.getDex.

vm/Init.cpp

diff --git a/vm/Init.cpp b/vm/Init.cpp
index d5b4989..9c4ee48 100644
--- a/vm/Init.cpp
+++ b/vm/Init.cpp
@@ -1627,6 +1627,20 @@
     // First set up JniConstants, which is used by libcore.
     JniConstants::init(pEnv);
 
+    // Set up our single JNI method.
+    // TODO: factor this out if we add more.
+    jclass c = pEnv->FindClass("java/lang/Class");
+    if (c == NULL) {
+        dvmAbort();
+    }
+    JNIEXPORT jobject JNICALL Java_java_lang_Class_getDex(JNIEnv* env, jclass javaClass);
+    const JNINativeMethod Java_java_lang_Class[] = {
+        { "getDex", "()Lcom/android/dex/Dex;", (void*) Java_java_lang_Class_getDex },
+    };
+    if (pEnv->RegisterNatives(c, Java_java_lang_Class, 1) != JNI_OK) {
+        dvmAbort();
+    }
+
     // Most JNI libraries can just use System.loadLibrary, but you can't
     // if you're the library that implements System.loadLibrary!
     loadJniLibrary("javacore");

vm/native/java_lang_Class.cpp

diff --git a/vm/native/java_lang_Class.cpp b/vm/native/java_lang_Class.cpp
index 88d31ef..e68be7b 100644
--- a/vm/native/java_lang_Class.cpp
+++ b/vm/native/java_lang_Class.cpp
@@ -785,7 +785,7 @@
 
     jmethodID com_android_dex_Dex_create =
             env->GetStaticMethodID(com_android_dex_Dex,
-                                   "<init>", "(Ljava/nio/ByteBuffer;)Lcom/android/dex/Dex;");
+                                   "create", "(Ljava/nio/ByteBuffer;)Lcom/android/dex/Dex;");
     if (com_android_dex_Dex_create == NULL) {
         return NULL;
     }