File tree Expand file tree Collapse file tree 3 files changed +27
-24
lines changed
pythonforandroid/recipes/pyjnius Expand file tree Collapse file tree 3 files changed +27
-24
lines changed Original file line number Diff line number Diff line change 8
8
class PyjniusRecipe (CythonRecipe ):
9
9
# "6553ad4" is one commit after last release (1.2.0)
10
10
# it fixes method resolution, required for resolving requestPermissions()
11
- version = '6553ad4 '
11
+ version = '1.2.1 '
12
12
url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
13
13
name = 'pyjnius'
14
14
depends = [('genericndkbuild' , 'sdl2' ), 'six' ]
Original file line number Diff line number Diff line change @@ -10,16 +10,17 @@ index ac89fec..71daa43 100644
10
10
cdef JNIEnv *get_platform_jnienv():
11
11
- return SDL_ANDROID_GetJNIEnv()
12
12
+ return <JNIEnv*>WebView_AndroidGetJNIEnv()
13
- diff --git a/setup.py b/setup.py
14
- index 740510f..0c8e55f 100644
15
- --- a/setup.py
16
- +++ b/setup.py
17
- @@ -53,7 +53,7 @@ except ImportError:
13
+ diff --git a/jnius/env.py b/jnius/env.py
14
+ --- a/jnius/env.py
15
+ +++ b/jnius/env.py
16
+ @@ -185,10 +185,10 @@ except ImportError:
18
17
19
- if PLATFORM == 'android':
20
- # for android, we use SDL...
21
- - LIBRARIES = ['sdl', 'log']
22
- + LIBRARIES = ['main', 'log']
23
- LIBRARY_DIRS = ['libs/' + getenv('ARCH')]
24
- elif PLATFORM == 'darwin':
25
- import subprocess
18
+ def get_libraries(platform):
19
+ if platform == 'android':
20
+ # for android, we use SDL...
21
+ - return ['sdl', 'log']
22
+ + return ['main', 'log']
23
+
24
+ elif platform == 'win32':
25
+ return ['jvm']
26
+
Original file line number Diff line number Diff line change @@ -10,16 +10,18 @@ index ac89fec..71daa43 100644
10
10
cdef JNIEnv *get_platform_jnienv():
11
11
- return SDL_ANDROID_GetJNIEnv()
12
12
+ return <JNIEnv*>SDL_AndroidGetJNIEnv()
13
- diff --git a/setup .py b/setup .py
13
+ diff --git a/env .py b/env .py
14
14
index 740510f..0c8e55f 100644
15
- --- a/setup .py
16
- +++ b/setup .py
17
- @@ -53,7 +53,7 @@ except ImportError:
15
+ --- a/jnius/env .py
16
+ +++ b/jnius/env .py
17
+ @@ -185,10 +185,10 @@ except ImportError:
18
18
19
- if PLATFORM == 'android':
20
- # for android, we use SDL...
21
- - LIBRARIES = ['sdl', 'log']
22
- + LIBRARIES = ['SDL2', 'log']
23
- LIBRARY_DIRS = ['libs/' + getenv('ARCH')]
24
- elif PLATFORM == 'darwin':
25
- import subprocess
19
+ def get_libraries(platform):
20
+ if platform == 'android':
21
+ # for android, we use SDL...
22
+ - return ['sdl', 'log']
23
+ + return ['SDL2', 'log']
24
+
25
+ elif platform == 'win32':
26
+ return ['jvm']
27
+
You can’t perform that action at this time.
0 commit comments