Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed NDK version number lookup

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-22 17:34:40 +01:00
parent 6e3f5bcd4f
commit 968178b5dd
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
prepare.py
View file

@ -140,7 +140,7 @@ class AndroidPreparator(prepare.Preparator):
retval = True retval = True
ndk_build = find_executable('ndk-build') ndk_build = find_executable('ndk-build')
ndk_path = os.path.dirname(ndk_build) ndk_path = os.path.dirname(ndk_build)
# NDK prior to r11 had a RELEASE.TXT file holding the version number # NDK prior to r11 had a RELEASE.TXT file holding the version number
release_file = os.path.join(ndk_path, 'RELEASE.TXT') release_file = os.path.join(ndk_path, 'RELEASE.TXT')
if os.path.isfile(release_file): if os.path.isfile(release_file):
version = open(release_file).read().strip() version = open(release_file).read().strip()
@ -156,8 +156,19 @@ class AndroidPreparator(prepare.Preparator):
if len(python_config_files) > 0: if len(python_config_files) > 0:
version = open(python_config_files[0]).readlines()[0] version = open(python_config_files[0]).readlines()[0]
res = re.match('^.*/(aosp-)?ndk-r(\d+).*$', version) res = re.match('^.*/(aosp-)?ndk-r(\d+).*$', version)
version = int(res.group(2)) if res is not None: # Will be if NDK < 16
retval = False version = int(res.group(2))
retval = False
else:
release_file = os.path.join(ndk_path, 'source.properties') # Since NDK 16
if os.path.isfile(release_file):
version = open(release_file).read().strip()
res = re.findall(r'(?:(\d+))', version)
version = int(res[0])
retval = False
else:
error("Could not get Android NDK version!")
sys.exit(-1)
else: else:
error("Could not get Android NDK version!") error("Could not get Android NDK version!")
sys.exit(-1) sys.exit(-1)