8000 Changed 'webviewjni' to 'genericndkbuild' · opacam/python-for-android@876363e · GitHub
[go: up one dir, main page]
Skip to content

Commit 876363e

Browse files
inclementinclement
committed
Changed 'webviewjni' to 'genericndkbuild'
1 parent 3c3095d commit 876363e

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

‎pythonforandroid/bootstraps/webview/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class WebViewBootstrap(Bootstrap):
88
name = 'webview'
99

10-
recipe_depends = ['webviewjni', ('python2', 'python3crystax')]
10+
recipe_depends = ['genericndkbuild', ('python2', 'python3crystax')]
1111

1212
def run_distribute(self):
1313
info_main('# Creating Android project from build and {} bootstrap'.format(

‎pythonforandroid/recipes/android/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
1313

1414
src_filename = 'src'
1515

16-
depends = [('pygame', 'sdl2', 'webviewjni'), ('python2', 'python3')]
16+
depends = [('pygame', 'sdl2', 'genericndkbuild'), ('python2', 'python3')]
1717

1818
config_env = {}
1919

‎pythonforandroid/recipes/webviewjni/__init__.py renamed to ‎pythonforandroid/recipes/genericndkbuild/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import sh
44

55

6-
class WebViewJNIRecipe(BootstrapNDKRecipe):
6+
class GenericNDKBuildRecipe(BootstrapNDKRecipe):
77
version = None
88
url = None
99

@@ -14,7 +14,7 @@ def should_build(self, arch):
1414
return True
1515

1616
def get_recipe_env(self, arch=None):
17-
env = super(WebViewJNIRecipe, self).get_recipe_env(arch)
17+
env = super(GenericNDKBuildRecipe, self).get_recipe_env(arch)
1818
py2 = self.get_recipe('python2', arch.ctx)
1919
env['PYTHON2_NAME'] = py2.get_dir_name()
2020
if 'python2' in self.ctx.recipe_build_order:
@@ -28,4 +28,4 @@ def build_arch(self, arch):
2828
shprint(sh.ndk_build, "V=1", _env=env)
2929

3030

31-
recipe = WebViewJNIRecipe()
31+
recipe = GenericNDKBuildRecipe()

‎pythonforandroid/recipes/pyjnius/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ class PyjniusRecipe(CythonRecipe):
99
version = 'master'
1010
url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
1111
name = 'pyjnius'
12-
depends = [('python2', 'python3crystax'), ('sdl2', 'sdl', 'webviewjni'), 'six']
12+
depends = [('python2', 'python3crystax'), ('sdl2', 'sdl', 'genericndkbuild'), 'six']
1313
site_packages_name = 'jnius'
1414

1515
patches = [('sdl2_jnienv_getter.patch', will_build('sdl2')),
16-
('webviewjni_jnienv_getter.patch', will_build('webviewjni'))]
16+
('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild'))]
1717

1818
def postbuild_arch(self, arch):
1919
super(PyjniusRecipe, self).postbuild_arch(arch)

‎pythonforandroid/recipes/pyjnius/webviewjni_jnienv_getter.patch renamed to ‎pythonforandroid/recipes/pyjnius/genericndkbuild_jnienv_getter.patch

File renamed without changes.

0 commit comments

Comments
 (0)
0