From 726ddebb87086e7c035f0f23facfe4936754de2d Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Wed, 4 Oct 2017 23:48:22 +0100 Subject: [PATCH 1/2] Re-added --sdk argument for sdl2 bootstrap, but with a warning --- pythonforandroid/bootstraps/sdl2/build/build.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py index 4a7f4668f1..b7799989b3 100755 --- a/pythonforandroid/bootstraps/sdl2/build/build.py +++ b/pythonforandroid/bootstraps/sdl2/build/build.py @@ -470,9 +470,10 @@ def parse_args(args=None): help=('Add a Java .jar to the libs, so you can access its ' 'classes with pyjnius. You can specify this ' 'argument more than once to include multiple jars')) + ## The --sdk option has been removed, it is ignored in favour of + ## --android-api handled by toolchain.py ap.add_argument('--sdk', dest='sdk_version', default=-1, - type=int, help=('Android SDK version to use. Default to ' - 'the value of minsdk')) + type=int, help=('Deprecated argument, does nothing')) ap.add_argument('--minsdk', dest='min_sdk_version', default=default_android_api, type=int, help=('Minimum Android SDK version to use. Default to ' @@ -509,8 +510,12 @@ def parse_args(args=None): print('Billing not yet supported in sdl2 bootstrap!') exit(1) - if args.sdk_version == -1: - args.sdk_version = args.min_sdk_version + # if args.sdk_version == -1: + # args.sdk_version = args.min_sdk_version + + if args.sdk_version != -1: + print('WARNING: Received a --sdk argument, but this argument is ' + 'deprecated and does nothing.') if args.permissions is None: args.permissions = [] From a5a4a5f4cde5ca1284d22a85fe06cb7c49576e01 Mon Sep 17 00:00:00 2001 From: ibobalo Date: Tue, 5 Dec 2017 13:49:39 +0200 Subject: [PATCH 2/2] vlc recipe compilation updated, better precompiled aar processing --- pythonforandroid/recipes/vlc/__init__.py | 31 +++++++++++++----------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pythonforandroid/recipes/vlc/__init__.py b/pythonforandroid/recipes/vlc/__init__.py index a10d9eb03c..db612e3395 100644 --- a/pythonforandroid/recipes/vlc/__init__.py +++ b/pythonforandroid/recipes/vlc/__init__.py @@ -1,5 +1,5 @@ from pythonforandroid.toolchain import Recipe, shprint, current_directory, warning, info, debug -from os.path import exists, join +from os.path import join, isdir, isfile from os import environ import sh from colorama import Fore, Style @@ -12,7 +12,7 @@ class VlcRecipe(Recipe): depends = [] port_git = 'http://git.videolan.org/git/vlc-ports/android.git' - vlc_git = 'http://git.videolan.org/git/vlc.git' +# vlc_git = 'http://git.videolan.org/git/vlc.git' ENV_LIBVLC_AAR = 'LIBVLC_AAR' aars = {} # for future use of multiple arch @@ -21,12 +21,14 @@ def prebuild_arch(self, arch): build_dir = self.get_build_dir(arch.arch) port_dir = join(build_dir, 'vlc-port-android') if self.ENV_LIBVLC_AAR in environ: - self.aars[arch] = aar = environ.get(self.ENV_LIBVLC_AAR) - if not exists(aar): - warning("Error: libvlc-.aar bundle " \ - "not found in {}".format(aar)) + aar = environ.get(self.ENV_LIBVLC_AAR) + if isdir(aar): + aar = join(aar, 'libvlc-{}.aar'.format(self.version)) + if not isfile(aar): + warning("Error: {} is not valid libvlc-.aar bundle".format(aar)) info("check {} environment!".format(self.ENV_LIBVLC_AAR)) exit(1) + self.aars[arch] = aar else: aar_path = join(port_dir, 'libvlc', 'build', 'outputs', 'aar') self.aars[arch] = aar = join(aar_path, 'libvlc-{}.aar'.format(self.version)) @@ -34,23 +36,24 @@ def prebuild_arch(self, arch): "in {} environment!".format(self.ENV_LIBVLC_AAR)) info("libvlc-.aar should build " \ "from sources at {}".format(port_dir)) - if not exists(join(port_dir, 'compile.sh')): + if not isfile(join(port_dir, 'compile.sh')): info("clone vlc port for android sources from {}".format( self.port_git)) shprint(sh.git, 'clone', self.port_git, port_dir, _tail=20, _critical=True) - vlc_dir = join(port_dir, 'vlc') - if not exists(join(vlc_dir, 'Makefile.am')): - info("clone vlc sources from {}".format(self.vlc_git)) - shprint(sh.git, 'clone', self.vlc_git, vlc_dir, - _tail=20, _critical=True) +# now "git clone ..." is a part of compile.sh +# vlc_dir = join(port_dir, 'vlc') +# if not isfile(join(vlc_dir, 'Makefile.am')): +# info("clone vlc sources from {}".format(self.vlc_git)) +# shprint(sh.git, 'clone', self.vlc_git, vlc_dir, +# _tail=20, _critical=True) def build_arch(self, arch): super(VlcRecipe, self).build_arch(arch) build_dir = self.get_build_dir(arch.arch) port_dir = join(build_dir, 'vlc-port-android') aar = self.aars[arch] - if not exists(aar): + if not isfile(aar): with current_directory(port_dir): env = dict(environ) env.update({ @@ -60,7 +63,7 @@ def build_arch(self, arch): }) info("compiling vlc from sources") debug("environment: {}".format(env)) - if not exists(join('bin', 'VLC-debug.apk')): + if not isfile(join('bin', 'VLC-debug.apk')): shprint(sh.Command('./compile.sh'), _env=env, _tail=50, _critical=True) shprint(sh.Command('./compile-libvlc.sh'), _env=env,