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

Europython sprint: Fix for prior ndk-url fix: uname()[4] for 32bit is not x86

Browse source
This commit is contained in:
Fabian Kreutz 2013-07-06 17:43:01 +03:00
parent 6a698c6596
commit 9a625e4ceb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
buildozer/targets/android.py
View file

@ -236,17 +236,18 @@ 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 is_64 = False # TODO: figure out bittiness
archive = 'android-ndk-r{0}-windows.zip' archive = 'android-ndk-r{0}-windows-{1}.tar.gz'
elif platform in ('darwin', ): elif platform in ('darwin', ):
architecture = os.uname()[4] is_64 = (os.uname()[4] == 'x86_64')
archive = 'android-ndk-r{0}-darwin-{1}.tar.bz2' archive = 'android-ndk-r{0}-darwin-{1}.tar.bz2'
elif platform in ('linux2', 'linux3'): elif platform in ('linux2', 'linux3'):
architecture = os.uname()[4] is_64 = (os.uname()[4] == 'x86_64')
archive = 'android-ndk-r{0}-linux-{1}.tar.bz2' 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))
architecture = 'x86_64' if is_64 else 'x86'
unpacked = 'android-ndk-r{0}' unpacked = 'android-ndk-r{0}'
archive = archive.format(self.android_ndk_version, architecture) archive = archive.format(self.android_ndk_version, architecture)
unpacked = unpacked.format(self.android_ndk_version) unpacked = unpacked.format(self.android_ndk_version)