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

make sure android.branch works with fresh clone

Browse source
This commit is contained in:
qua-non 2013-10-11 06:09:03 +05:30
parent 3dcae5a311
commit cb4690e564
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
buildozer/targets/android.py
View file

@ -69,7 +69,7 @@ class TargetAndroid(Target):
version = self.buildozer.config.getdefault( version = self.buildozer.config.getdefault(
'app', 'android.ndk', self.android_ndk_version) 'app', 'android.ndk', self.android_ndk_version)
return join(self.buildozer.global_platform_dir, return join(self.buildozer.global_platform_dir,
'android-ndk-{0}'.format(version)) 'android-ndk-r{0}'.format(version))
@property @property
def apache_ant_dir(self): def apache_ant_dir(self):
@ -301,10 +301,10 @@ class TargetAndroid(Target):
cmd('git clean -dxf', cwd=pa_dir) cmd('git clean -dxf', cwd=pa_dir)
cmd('git pull origin master', cwd=pa_dir) cmd('git pull origin master', cwd=pa_dir)
source = self.buildozer.config.getdefault('app', 'android.branch') source = self.buildozer.config.getdefault('app', 'android.branch')
if source: if source:
cmd('git checkout --track -b %s origin/%s' % (source, source), cmd('git checkout %s' % (source),
cwd=pa_dir) cwd=pa_dir)
self._install_apache_ant() self._install_apache_ant()
self._install_android_sdk() self._install_android_sdk()