From 876363e21ae7fdd8e934c86b3b7b86e6f1f66857 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Thu, 9 Jun 2016 23:21:43 +0100 Subject: [PATCH] Changed 'webviewjni' to 'genericndkbuild' --- pythonforandroid/bootstraps/webview/__init__.py | 2 +- pythonforandroid/recipes/android/__init__.py | 2 +- .../recipes/{webviewjni => genericndkbuild}/__init__.py | 6 +++--- pythonforandroid/recipes/pyjnius/__init__.py | 4 ++-- ...env_getter.patch => genericndkbuild_jnienv_getter.patch} | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename pythonforandroid/recipes/{webviewjni => genericndkbuild}/__init__.py (83%) rename pythonforandroid/recipes/pyjnius/{webviewjni_jnienv_getter.patch => genericndkbuild_jnienv_getter.patch} (100%) diff --git a/pythonforandroid/bootstraps/webview/__init__.py b/pythonforandroid/bootstraps/webview/__init__.py index 315092d7dd..392608677b 100644 --- a/pythonforandroid/bootstraps/webview/__init__.py +++ b/pythonforandroid/bootstraps/webview/__init__.py @@ -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( diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py index e2dcefb277..da55f4c8f9 100644 --- a/pythonforandroid/recipes/android/__init__.py +++ b/pythonforandroid/recipes/android/__init__.py @@ -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 = {} diff --git a/pythonforandroid/recipes/webviewjni/__init__.py b/pythonforandroid/recipes/genericndkbuild/__init__.py similarity index 83% rename from pythonforandroid/recipes/webviewjni/__init__.py rename to pythonforandroid/recipes/genericndkbuild/__init__.py index af3930f871..7079399a61 100644 --- a/pythonforandroid/recipes/webviewjni/__init__.py +++ b/pythonforandroid/recipes/genericndkbuild/__init__.py @@ -3,7 +3,7 @@ import sh -class WebViewJNIRecipe(BootstrapNDKRecipe): +class GenericNDKBuildRecipe(BootstrapNDKRecipe): version = None url = None @@ -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: @@ -28,4 +28,4 @@ def build_arch(self, arch): shprint(sh.ndk_build, "V=1", _env=env) -recipe = WebViewJNIRecipe() +recipe = GenericNDKBuildRecipe() diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py index ee4ba699bd..7aad8d46ee 100644 --- a/pythonforandroid/recipes/pyjnius/__init__.py +++ b/pythonforandroid/recipes/pyjnius/__init__.py @@ -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) diff --git a/pythonforandroid/recipes/pyjnius/webviewjni_jnienv_getter.patch b/pythonforandroid/recipes/pyjnius/genericndkbuild_jnienv_getter.patch similarity index 100% rename from pythonforandroid/recipes/pyjnius/webviewjni_jnienv_getter.patch rename to pythonforandroid/recipes/pyjnius/genericndkbuild_jnienv_getter.patch