Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pythonforandroid/bootstraps/webview/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class WebViewBootstrap(Bootstrap):
name = 'webview'

recipe_depends = ['webviewjni', ('python2', 'python3crystax')]
recipe_depends = ['genericndkbuild', ('python2', 'python3crystax')]

def run_distribute(self):
info_main('# Creating Android project from build and {} bootstrap'.format(
Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/android/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):

src_filename = 'src'

depends = [('pygame', 'sdl2', 'webviewjni'), ('python2', 'python3')]
depends = [('pygame', 'sdl2', 'genericndkbuild'), ('python2', 'python3')]

config_env = {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sh


class WebViewJNIRecipe(BootstrapNDKRecipe):
class GenericNDKBuildRecipe(BootstrapNDKRecipe):
version = None
url = None

Expand All @@ -14,7 +14,7 @@ def should_build(self, arch):
return True

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


recipe = WebViewJNIRecipe()
recipe = GenericNDKBuildRecipe()
4 changes: 2 additions & 2 deletions pythonforandroid/recipes/pyjnius/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class PyjniusRecipe(CythonRecipe):
version = 'master'
url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
name = 'pyjnius'
depends = [('python2', 'python3crystax'), ('sdl2', 'sdl', 'webviewjni'), 'six']
depends = [('python2', 'python3crystax'), ('sdl2', 'sdl', 'genericndkbuild'), 'six']
site_packages_name = 'jnius'

patches = [('sdl2_jnienv_getter.patch', will_build('sdl2')),
('webviewjni_jnienv_getter.patch', will_build('webviewjni'))]
('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild'))]

def postbuild_arch(self, arch):
super(PyjniusRecipe, self).postbuild_arch(arch)
Expand Down