Changeset 13959

Timestamp:

11/14/12 20:27:06 (12 years ago)

Author:

Eric.Larour

Message:

CHG: pushed Lan's changes to avoid using Javah on Main.cpp

Location:

issm/trunk-jpl/src/android/ISSM/jni

Files:

• Main.cpp (modified) (1 diff)
• Main_nojavah.cpp (deleted)
• com_example_issm_IssmJni.h (deleted)

issm/trunk-jpl/src/android/ISSM/jni/Main.cpp

@@ +1 @@
+#include <jni.h>
 #include "../../../c/android/fac.h"
-#include "com_example_issm_IssmJni.h"
-#include <cstddef>
+namespace com_example_issm
+{
+        static jlong factorial(JNIEnv *env, jclass clazz, jlong n)
+        {
+                fac *f = new fac();
+                jlong result = (jlong) (f->factorial(n));
+                delete(f);
+                return (jlong) result;
+        }
+//------------------------------------------------------------------------------------
+        static JNINativeMethod method_table[] = {
+                        {"fac" ,"(J)J" , (void *) factorial},
+        };
+}
 
-JNIEXPORT jlong JNICALL Java_com_example_issm_IssmJni_fac(JNIEnv *env, jclass clazz, jlong n)
+using namespace com_example_issm;
+
+extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
-        fac *f = new fac();
-        jlong result = (jlong) (f->factorial(n));
-        delete(f);
-        return (jlong) result;
+    JNIEnv* env;
+    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+        return -1;
+    }
+    else
+    {
+        jclass clazz = env->FindClass("com/example/issm/IssmJni");
+        if(clazz)
+        {
+                env->RegisterNatives(clazz, method_table, 1);
+                env->DeleteLocalRef(clazz);
+                return JNI_VERSION_1_6;
+        }
+        else return -1;
+    }
+
+    // Get jclass with env->FindClass.
+    // Register methods with env->RegisterNatives.
 }