mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Merge branch 'ndk-path-long' into 'master'
metadata.Build.ndk_path(): find long form ndk too Closes #1099 See merge request fdroid/fdroidserver!1313
This commit is contained in:
commit
08d4b4671c
@ -21,6 +21,7 @@
|
|||||||
import git
|
import git
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import platform
|
import platform
|
||||||
|
import os
|
||||||
import re
|
import re
|
||||||
import logging
|
import logging
|
||||||
import importlib
|
import importlib
|
||||||
@ -329,7 +330,13 @@ class Build(dict):
|
|||||||
ndk = self.ndk
|
ndk = self.ndk
|
||||||
if isinstance(ndk, list):
|
if isinstance(ndk, list):
|
||||||
ndk = self.ndk[0]
|
ndk = self.ndk[0]
|
||||||
return common.config['ndk_paths'].get(ndk, '')
|
path = common.config['ndk_paths'].get(ndk)
|
||||||
|
if path:
|
||||||
|
return path
|
||||||
|
for vsn, path in common.config['ndk_paths'].items():
|
||||||
|
if not vsn.endswith("_orig") and path and os.path.basename(path) == ndk:
|
||||||
|
return path
|
||||||
|
return ''
|
||||||
|
|
||||||
|
|
||||||
flagtypes = {
|
flagtypes = {
|
||||||
|
Loading…
Reference in New Issue
Block a user