Europython sprint outcome: enable download of 64bit NDK version
This commit is contained in:
parent
421a8e991c
commit
14fb039b99
1 changed files with 7 additions and 3 deletions
|
@ -16,6 +16,7 @@ APACHE_ANT_VERSION = '1.8.4'
|
||||||
|
|
||||||
|
|
||||||
import traceback
|
import traceback
|
||||||
|
import os
|
||||||
from pipes import quote
|
from pipes import quote
|
||||||
from sys import platform, executable
|
from sys import platform, executable
|
||||||
from buildozer.target import Target
|
from buildozer.target import Target
|
||||||
|
@ -230,16 +231,19 @@ class TargetAndroid(Target):
|
||||||
|
|
||||||
self.buildozer.info('Android NDK is missing, downloading')
|
self.buildozer.info('Android NDK is missing, downloading')
|
||||||
if platform in ('win32', 'cygwin'):
|
if platform in ('win32', 'cygwin'):
|
||||||
|
architecture = None
|
||||||
archive = 'android-ndk-r{0}-windows.zip'
|
archive = 'android-ndk-r{0}-windows.zip'
|
||||||
elif platform in ('darwin', ):
|
elif platform in ('darwin', ):
|
||||||
archive = 'android-ndk-r{0}-darwin-x86.tar.bz2'
|
architecture = os.uname()[4]
|
||||||
|
archive = 'android-ndk-r{0}-darwin-{1}.tar.bz2'
|
||||||
elif platform in ('linux2', 'linux3'):
|
elif platform in ('linux2', 'linux3'):
|
||||||
archive = 'android-ndk-r{0}-linux-x86.tar.bz2'
|
architecture = os.uname()[4]
|
||||||
|
archive = 'android-ndk-r{0}-linux-{1}.tar.bz2'
|
||||||
else:
|
else:
|
||||||
raise SystemError('Unsupported platform: {0}'.format(platform))
|
raise SystemError('Unsupported platform: {0}'.format(platform))
|
||||||
|
|
||||||
unpacked = 'android-ndk-r{0}'
|
unpacked = 'android-ndk-r{0}'
|
||||||
archive = archive.format(self.android_ndk_version)
|
archive = archive.format(self.android_ndk_version, architecture)
|
||||||
unpacked = unpacked.format(self.android_ndk_version)
|
unpacked = unpacked.format(self.android_ndk_version)
|
||||||
url = 'http://dl.google.com/android/ndk/'
|
url = 'http://dl.google.com/android/ndk/'
|
||||||
self.buildozer.download(url, archive,
|
self.buildozer.download(url, archive,
|
||||||
|
|
Loading…
Reference in a new issue