am dd19f5b9: Merge "Fix for a crash when GC weak references."

[android-x86/dalvik.git] / libnativehelper / Register.c

diff --git a/libnativehelper/Register.c b/libnativehelper/Register.c
index 1de679a..87017ac 100644 (file)
--- a/libnativehelper/Register.c
+++ b/libnativehelper/Register.c
@@ -14,14 +14,20 @@
  * limitations under the License.
  */
 
+/*
+ * JNI helper functions.
+ */
+
 #include "jni.h"
 
 extern int registerCoreLibrariesJni(JNIEnv* env);
+extern int registerJniHelp(JNIEnv* env);
 
 /*
  * Register all methods for system classes.
  */
 int jniRegisterSystemMethods(JNIEnv* env)
 {
-    return registerCoreLibrariesJni(env);
+    // We initialize JNIHelp.c first so that the core libraries can safely rely on it.
+    return registerJniHelp(env) != -1 && registerCoreLibrariesJni(env) != -1;
 }