refactor JNI initialization

Author: Mihail Slavchev

src/jni/NativePlatform.cpp

@@ -42,7 +42,7 @@ int AppJavaObjectID = -1;
 int count = 0;
 SimpleAllocator g_allocator;
 
-jint NativePlatform::JNI_ON_LOAD(JavaVM *vm, void *reserved)
+void NativePlatform::Init(JavaVM *vm, void *reserved)
 {
 	__android_log_print(ANDROID_LOG_INFO, "TNS.Native", "NativeScript Runtime Version %s, commit %s", NATIVE_SCRIPT_RUNTIME_VERSION, NATIVE_SCRIPT_RUNTIME_COMMIT_SHA);
 	DEBUG_WRITE("JNI_ONLoad");
@@ -57,8 +57,6 @@ jint NativePlatform::JNI_ON_LOAD(JavaVM *vm, void *reserved)
 	}
 
 	DEBUG_WRITE("JNI_ONLoad END");
-
-	return JNI_VERSION_1_6;
 }
 
 Isolate* NativePlatform::InitNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jint appJavaObjectId, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger)

src/jni/NativePlatform.h

@@ -15,7 +15,7 @@ namespace tns
 	class NativePlatform
 	{
 		public:
-			static jint JNI_ON_LOAD(JavaVM *vm, void *reserved);
+			static void Init(JavaVM *vm, void *reserved);
 			static v8::Isolate* InitNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jint appJavaObjectId, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger);
 			static void RunModule(JNIEnv *_env, jobject obj, jstring scriptFile);
 			static jobject RunScript(JNIEnv *_env, jobject obj, jstring scriptFile);

src/jni/com_tns_Platform.cpp

@@ -13,7 +13,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 {
 	try
 	{
-		return NativePlatform::JNI_ON_LOAD(vm, reserved);
+		NativePlatform::Init(vm, reserved);
 	}
 	catch (NativeScriptException& e)
 	{
@@ -29,6 +29,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 		NativeScriptException nsEx(std::string("Error: c++ exception!"));
 		nsEx.ReThrowToJava();
 	}
+
+	return JNI_VERSION_1_6;
 }
 
 extern "C" void Java_com_tns_Platform_initNativeScript(JNIEnv *_env, jobject obj, jstring filesPath, jint appJavaObjectId, jboolean verboseLoggingEnabled, jstring packageName, jobjectArray args, jobject jsDebugger)