LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #375 from inclement/fix_p4a_call

Browse source 
Always pass required args to p4a in android_new
This commit is contained in:
Alexander Taylor 2016-07-09 00:08:01 +01:00 • committed by GitHub
commit 7f6a2fe864
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
buildozer/targets/android_new.py
View file

@ -14,20 +14,22 @@ class TargetAndroidNew(TargetAndroid):
p4a_branch = "master" p4a_branch = "master"
p4a_directory = "python-for-android-master" p4a_directory = "python-for-android-master"
p4a_apk_cmd = "apk --bootstrap=" p4a_apk_cmd = "apk --bootstrap="
extra_p4a_args = ''
def __init__(self, buildozer): def __init__(self, buildozer):
super(TargetAndroidNew, self).__init__(buildozer) super(TargetAndroidNew, self).__init__(buildozer)
self._build_dir = join(self.buildozer.platform_dir, 'build') self._build_dir = join(self.buildozer.platform_dir, 'build')
color = 'always' if USE_COLOR else 'never'
self._p4a_cmd = ('python -m pythonforandroid.toolchain ') self._p4a_cmd = ('python -m pythonforandroid.toolchain ')
self._p4a_bootstrap = self.buildozer.config.getdefault( self._p4a_bootstrap = self.buildozer.config.getdefault(
'app', 'android.bootstrap', 'sdl2') 'app', 'android.bootstrap', 'sdl2')
self.p4a_apk_cmd += ('{} --color={} --storage-dir={}'.format( self.p4a_apk_cmd += self._p4a_bootstrap
self._p4a_bootstrap, color, self._build_dir)) color = 'always' if USE_COLOR else 'never'
self.extra_p4a_args = ' --color={} --storage-dir={}'.format(
color, self._build_dir)
def _p4a(self, cmd, **kwargs): def _p4a(self, cmd, **kwargs):
kwargs.setdefault('cwd', self.pa_dir) kwargs.setdefault('cwd', self.pa_dir)
return self.buildozer.cmd(self._p4a_cmd + cmd, **kwargs) return self.buildozer.cmd(self._p4a_cmd + cmd + self.extra_p4a_args, **kwargs)
def get_available_packages(self): def get_available_packages(self):
return True return True