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

fix ndk version check & download link (#1271)

Browse source 
* fix ndk version check & download link
* tiny code cleanup
This commit is contained in:
Felix C. Stegerman 2021-05-01 11:54:22 +02:00 committed by GitHub
parent ddf68cec0b
commit f81d21adac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
buildozer/targets/android.py
View file

@ -416,7 +416,7 @@ class TargetAndroid(Target):
return ndk_dir return ndk_dir
import re import re
_version = re.search('(.+?)[a-z]', self.android_ndk_version).group(1) _version = int(re.search(r'(\d+)', self.android_ndk_version).group(1))
self.buildozer.info('Android NDK is missing, downloading') self.buildozer.info('Android NDK is missing, downloading')
# Welcome to the NDK URL hell! # Welcome to the NDK URL hell!
@ -426,28 +426,23 @@ class TargetAndroid(Target):
# from 10e on the URLs can be looked up at # from 10e on the URLs can be looked up at
# https://developer.android.com/ndk/downloads/older_releases # https://developer.android.com/ndk/downloads/older_releases
is_darwin = platform == 'darwin'
is_linux = platform.startswith('linux')
if platform in ('win32', 'cygwin'): if platform in ('win32', 'cygwin'):
# Checking of 32/64 bits at Windows from: https://stackoverflow.com/a/1405971/798575 # Checking of 32/64 bits at Windows from: https://stackoverflow.com/a/1405971/798575
import struct import struct
archive = 'android-ndk-r{0}-windows-{1}.zip' archive = 'android-ndk-r{0}-windows-{1}.zip'
is_64 = (8 * struct.calcsize("P") == 64) is_64 = (8 * struct.calcsize("P") == 64)
elif is_darwin or is_linux:
elif platform in ('darwin', ): _platform = 'linux' if is_linux else 'darwin'
if _version >= '10e': if self.android_ndk_version in ['10c', '10d', '10e']:
archive = 'android-ndk-r{0}-darwin-{1}.zip' ext = 'bin'
elif _version >= '10c': elif _version <= 10:
archive = 'android-ndk-r{0}-darwin-{1}.bin' ext = 'tar.bz2'
else: else:
archive = 'android-ndk-r{0}-darwin-{1}.tar.bz2' ext = 'zip'
is_64 = (os.uname()[4] == 'x86_64') archive = 'android-ndk-r{0}-' + _platform + '-{1}.' + ext
elif platform.startswith('linux'):
if _version >= '10e':
archive = 'android-ndk-r{0}-linux-{1}.zip'
elif _version >= '10c':
archive = 'android-ndk-r{0}-linux-{1}.bin'
else:
archive = 'android-ndk-r{0}-linux-{1}.tar.bz2'
is_64 = (os.uname()[4] == 'x86_64') is_64 = (os.uname()[4] == 'x86_64')
else: else:
raise SystemError('Unsupported platform: {}'.format(platform)) raise SystemError('Unsupported platform: {}'.format(platform))
@ -457,7 +452,7 @@ class TargetAndroid(Target):
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)
if _version >= '10e': if _version >= 11:
url = 'https://dl.google.com/android/repository/' url = 'https://dl.google.com/android/repository/'
else: else:
url = 'https://dl.google.com/android/ndk/' url = 'https://dl.google.com/android/ndk/'