Merge pull request #44 from kivy/android_branch
make sure android.branch works with fresh clone
This commit is contained in:
commit
a5f1cf4e8a
1 changed files with 5 additions and 5 deletions
|
@ -69,7 +69,7 @@ class TargetAndroid(Target):
|
|||
version = self.buildozer.config.getdefault(
|
||||
'app', 'android.ndk', self.android_ndk_version)
|
||||
return join(self.buildozer.global_platform_dir,
|
||||
'android-ndk-{0}'.format(version))
|
||||
'android-ndk-r{0}'.format(version))
|
||||
|
||||
@property
|
||||
def apache_ant_dir(self):
|
||||
|
@ -303,7 +303,7 @@ class TargetAndroid(Target):
|
|||
|
||||
source = self.buildozer.config.getdefault('app', 'android.branch')
|
||||
if source:
|
||||
cmd('git checkout --track -b %s origin/%s' % (source, source),
|
||||
cmd('git checkout %s' % (source),
|
||||
cwd=pa_dir)
|
||||
|
||||
self._install_apache_ant()
|
||||
|
|
Loading…
Reference in a new issue