Fixed pyjnius build with webviewjni

inclement · inclement · commit 345057cdb840 · 2016-05-01T14:53:28.000+01:00
diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py
@@ -9,10 +9,11 @@ class PyjniusRecipe(CythonRecipe):
     version = 'master'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'
-    depends = [('python2', 'python3crystax'), ('sdl2', 'sdl'), 'six']
+    depends = [('python2', 'python3crystax'), ('sdl2', 'sdl', 'webviewjni'), 'six']
     site_packages_name = 'jnius'
 
-    patches = [('sdl2_jnienv_getter.patch', will_build('sdl2'))]
+    patches = [('sdl2_jnienv_getter.patch', will_build('sdl2')),
+               ('webviewjni_jnienv_getter.patch', will_build('webviewjni'))]
 
     def postbuild_arch(self, arch):
         super(PyjniusRecipe, self).postbuild_arch(arch)
diff --git a/pythonforandroid/recipes/pyjnius/webviewjni_jnienv_getter.patch b/pythonforandroid/recipes/pyjnius/webviewjni_jnienv_getter.patch
@@ -0,0 +1,25 @@
+diff --git a/jnius/jnius_jvm_android.pxi b/jnius/jnius_jvm_android.pxi
+index ac89fec..71daa43 100644
+--- a/jnius/jnius_jvm_android.pxi
++++ b/jnius/jnius_jvm_android.pxi
+@@ -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 JNIEnv *get_platform_jnienv():
+-    return SDL_ANDROID_GetJNIEnv()
++    return <JNIEnv*>SDL_AndroidGetJNIEnv()
+diff --git a/setup.py b/setup.py
+index 740510f..0c8e55f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -53,7 +53,7 @@ except ImportError:
+ 
+ if platform == 'android':
+     # for android, we use SDL...
+-    libraries = ['sdl', 'log']
++    libraries = ['main', 'log']
+     library_dirs = ['libs/' + getenv('ARCH')]
+ elif platform == 'darwin':
+     import subprocess
diff --git a/pythonforandroid/recipes/webviewjni/__init__.py b/pythonforandroid/recipes/webviewjni/__init__.py
@@ -8,7 +8,7 @@ class WebViewJNIRecipe(BootstrapNDKRecipe):
     url = None
 
     depends = [('python2', 'python3crystax')]
-    conflicts = ['sdl2', 'pygame']
+    conflicts = ['sdl2', 'pygame', 'sdl']
 
     def should_build(self, arch):
         return True
