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

fix prepare.py

Browse source
This commit is contained in:
Erwan Croze 2017-11-24 11:56:27 +01:00
parent 62041d1c7c
commit 053d73f60d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
prepare.py
View file

@ -156,19 +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)
if res is not None: # Will be if NDK < 16 if res is not None: # Will be if NDK < 16
version = int(res.group(2)) version = int(res.group(2))
retval = False retval = False
else: else:
release_file = os.path.join(ndk_path, 'source.properties') # Since NDK 16 release_file = os.path.join(ndk_path, 'source.properties') # Since NDK 16
if os.path.isfile(release_file): if os.path.isfile(release_file):
version = open(release_file).read().strip() version = open(release_file).read().strip()
res = re.findall(r'(?:(\d+))', version) res = re.findall(r'(?:(\d+))', version)
version = int(res[0]) version = int(res[0])
retval = False retval = False
else: else:
error("Could not get Android NDK version!") error("Could not get Android NDK version!")
sys.exit(-1) 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)