Changeset 4927

Timestamp:

Sep 23, 2014 4:13:40 AM (10 years ago)

Author:

ming

Message:

Fixed #1792: Create generic JNI OnLoad? function

Location:

pjproject/trunk

Files:

• pjlib/src/pj/os_core_unix.c (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/android_jni_dev.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/os_core_unix.c

@@ -49 +49 @@
 #define SIGNATURE1  0xDEAFBEEF
 #define SIGNATURE2  0xDEADC0DE
+
+#ifndef PJ_JNI_HAS_JNI_ONLOAD
+#  define PJ_JNI_HAS_JNI_ONLOAD    PJ_ANDROID
+#endif
+
+#if defined(PJ_JNI_HAS_JNI_ONLOAD) && PJ_JNI_HAS_JNI_ONLOAD != 0
+
+#include <jni.h>
+
+JavaVM *pj_jni_jvm = NULL;
+
+JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved)
+{
+    pj_jni_jvm = vm;
+    
+    return JNI_VERSION_1_4;
+}
+#endif
 
 struct pj_thread_t

pjproject/trunk/pjmedia/src/pjmedia-audiodev/android_jni_dev.c

@@ -142 +142 @@
 };
 
-JavaVM *android_jvm;
-
-JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved)
-{
-    android_jvm = vm;
-    
-    return JNI_VERSION_1_4;
-}
+extern JavaVM *pj_jni_jvm;
 
 static pj_bool_t attach_jvm(JNIEnv **jni_env)
 {
-    if ((*android_jvm)->GetEnv(android_jvm, (void **)jni_env,
+    if ((*pj_jni_jvm)->GetEnv(pj_jni_jvm, (void **)jni_env,
                                JNI_VERSION_1_4) < 0)
     {
-        if ((*android_jvm)->AttachCurrentThread(android_jvm, jni_env, NULL) < 0)
+        if ((*pj_jni_jvm)->AttachCurrentThread(pj_jni_jvm, jni_env, NULL) < 0)
         {
             jni_env = NULL;
@@ -169 +162 @@
 #define detach_jvm(attached) \
     if (attached) \
-        (*android_jvm)->DetachCurrentThread(android_jvm);
+        (*pj_jni_jvm)->DetachCurrentThread(pj_jni_jvm);
 
 /* Thread priority utils */