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

Merge pull request from kived/android-bootstrap

Browse source 
allow selection of bootstrap for android_new
This commit is contained in:
Ryan Pessa 2016-05-11 10:24:36 -05:00
commit 2a3fe470d2
2 changed files with 8 additions and 2 deletions

3
buildozer/default.spec
View file

@ -109,6 +109,9 @@ fullscreen = 1
# when an update is due and you just want to test/build your package # when an update is due and you just want to test/build your package
# android.skip_update = False # android.skip_update = False
# (str) Bootstrap to use for android builds (android_new only)
# android.bootstrap = sdl2
# (str) Android entry point, default is ok for Kivy-based app # (str) Android entry point, default is ok for Kivy-based app
#android.entrypoint = org.renpy.android.PythonActivity #android.entrypoint = org.renpy.android.PythonActivity

7
buildozer/targets/android_new.py
View file

@ -13,7 +13,7 @@ class TargetAndroidNew(TargetAndroid):
targetname = 'android_new' targetname = 'android_new'
p4a_branch = "master" p4a_branch = "master"
p4a_directory = "python-for-android-master" p4a_directory = "python-for-android-master"
p4a_apk_cmd = "apk --bootstrap=sdl2" p4a_apk_cmd = "apk --bootstrap="
def __init__(self, buildozer): def __init__(self, buildozer):
super(TargetAndroidNew, self).__init__(buildozer) super(TargetAndroidNew, self).__init__(buildozer)
@ -21,6 +21,9 @@ class TargetAndroidNew(TargetAndroid):
color = 'always' if USE_COLOR else 'never' color = 'always' if USE_COLOR else 'never'
self._p4a_cmd = ('python -m pythonforandroid.toolchain --color={} ' self._p4a_cmd = ('python -m pythonforandroid.toolchain --color={} '
'--storage-dir={} ').format(color, self._build_dir) '--storage-dir={} ').format(color, self._build_dir)
self._p4a_bootstrap = self.buildozer.config.getdefault(
'app', 'android.bootstrap', 'sdl2')
self.p4a_apk_cmd += self._p4a_bootstrap
def _p4a(self, cmd, **kwargs): def _p4a(self, cmd, **kwargs):
kwargs.setdefault('cwd', self.pa_dir) kwargs.setdefault('cwd', self.pa_dir)
@ -52,7 +55,7 @@ class TargetAndroidNew(TargetAndroid):
options.append("--copy-libs") options.append("--copy-libs")
available_modules = self._p4a( available_modules = self._p4a(
"create --dist_name={} --bootstrap={} --requirements={} --arch armeabi-v7a {}".format( "create --dist_name={} --bootstrap={} --requirements={} --arch armeabi-v7a {}".format(
dist_name, "sdl2", requirements, " ".join(options)), dist_name, self._p4a_bootstrap, requirements, " ".join(options)),
get_stdout=True)[0] get_stdout=True)[0]
def _update_libraries_references(self, dist_dir): def _update_libraries_references(self, dist_dir):