Changed webview pyjnius patch function names

inclement · inclement · commit 4973f8b1dc6b · 2016-05-07T00:27:01.000+01:00
diff --git a/pythonforandroid/bootstraps/webview/build/jni/src/pyjniusjni.c b/pythonforandroid/bootstraps/webview/build/jni/src/pyjniusjni.c
@@ -7,7 +7,7 @@
 
 #include "android/log.h"
 
-/* These JNI management functions are taken from SDL2 */
+/* These JNI management functions are taken from SDL2, but modified to refer to pyjnius */
 
 /* #define LOG(n, x) __android_log_write(ANDROID_LOG_INFO, (n), (x)) */
 /* #define LOGP(x) LOG("python", (x)) */
@@ -45,7 +45,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved)
      */
     if (pthread_key_create(&mThreadKey, Android_JNI_ThreadDestroyed) != 0) {
 
-        __android_log_print(ANDROID_LOG_ERROR, "SDL", "Error initializing pthread key");
+        __android_log_print(ANDROID_LOG_ERROR, "pyjniusjni", "Error initializing pthread key");
     }
     Android_JNI_SetupThread();
 
@@ -97,7 +97,7 @@ static void Android_JNI_ThreadDestroyed(void* value)
     }
 }
 
-void *SDL_AndroidGetJNIEnv()
+void *WebView_AndroidGetJNIEnv()
 {
     return Android_JNI_GetEnv();
 }
diff --git a/pythonforandroid/recipes/pyjnius/webviewjni_jnienv_getter.patch b/pythonforandroid/recipes/pyjnius/webviewjni_jnienv_getter.patch
@@ -5,11 +5,11 @@ index ac89fec..71daa43 100644
 @@ -1,5 +1,5 @@
  # on android, rely on SDL to get the JNI env
 -cdef extern JNIEnv *SDL_ANDROID_GetJNIEnv()
-+cdef extern JNIEnv *SDL_AndroidGetJNIEnv()
++cdef extern JNIEnv *WebView_AndroidGetJNIEnv()
  
  cdef JNIEnv *get_platform_jnienv():
 -    return SDL_ANDROID_GetJNIEnv()
-+    return <JNIEnv*>SDL_AndroidGetJNIEnv()
++    return <JNIEnv*>WebView_AndroidGetJNIEnv()
 diff --git a/setup.py b/setup.py
 index 740510f..0c8e55f 100644
 --- a/setup.py

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`#include "android/log.h"`
`9`	`9`
`10`		`-/* These JNI management functions are taken from SDL2 */`
	`10`	`+/* These JNI management functions are taken from SDL2, but modified to refer to pyjnius */`
`11`	`11`
`12`	`12`	`/* #define LOG(n, x) __android_log_write(ANDROID_LOG_INFO, (n), (x)) */`
`13`	`13`	`/* #define LOGP(x) LOG("python", (x)) */`
`@@ -45,7 +45,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved)`
`45`	`45`	`*/`
`46`	`46`	`if (pthread_key_create(&mThreadKey, Android_JNI_ThreadDestroyed) != 0) {`
`47`	`47`
`48`		`- __android_log_print(ANDROID_LOG_ERROR, "SDL", "Error initializing pthread key");`
	`48`	`+ __android_log_print(ANDROID_LOG_ERROR, "pyjniusjni", "Error initializing pthread key");`
`49`	`49`	`}`
`50`	`50`	`Android_JNI_SetupThread();`
`51`	`51`
`@@ -97,7 +97,7 @@ static void Android_JNI_ThreadDestroyed(void* value)`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`-void *SDL_AndroidGetJNIEnv()`
	`100`	`+void *WebView_AndroidGetJNIEnv()`
`101`	`101`	`{`
`102`	`102`	`return Android_JNI_GetEnv();`
`103`	`103`	`}`