mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: remove default NDK, closes #717

Browse source
This commit is contained in:
Hans-Christoph Steiner 2021-05-12 14:24:05 +02:00
parent 69fcd6a024
commit 9fc2a23713
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
5 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/config.yml
View file

@ -5,14 +5,14 @@
# Custom path to the Android SDK, defaults to $ANDROID_HOME # Custom path to the Android SDK, defaults to $ANDROID_HOME
# sdk_path: $ANDROID_HOME # sdk_path: $ANDROID_HOME
# Custom paths to various versions of the Android NDK, defaults to 'r12b' set # Paths to various installed versions of the Android NDK. If a
# to $ANDROID_NDK. Most users will have the latest at $ANDROID_NDK, which is # required version is missing in the buildserver VM, it will be
# used by default. If a version is missing or assigned to None, it is assumed # automatically downloaded and installed into a temporary dir.
# not installed. #
# ndk_paths: # ndk_paths:
# r10e: None # r10e: None
# r11c: None # r11c: None
# r12b: $ANDROID_NDK # r12b: None
# r13b: None # r13b: None
# r14b: None # r14b: None
# r15c: None # r15c: None

2
fdroidserver/build.py
View file

@ -361,7 +361,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
ndk_path = build.ndk_path() ndk_path = build.ndk_path()
if build.ndk or (build.buildjni and build.buildjni != ['no']): if build.ndk or (build.buildjni and build.buildjni != ['no']):
if not ndk_path: if not ndk_path:
logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r12b') logging.critical("Android NDK version '%s' could not be found!" % build.ndk)
logging.critical("Configured versions:") logging.critical("Configured versions:")
for k, v in config['ndk_paths'].items(): for k, v in config['ndk_paths'].items():
if k.endswith("_orig"): if k.endswith("_orig"):

10
fdroidserver/common.py
View file

@ -118,15 +118,7 @@ orig_path = None
default_config = { default_config = {
'sdk_path': "$ANDROID_HOME", 'sdk_path': "$ANDROID_HOME",
'ndk_paths': { 'ndk_paths': {},
'r10e': None,
'r11c': None,
'r12b': "$ANDROID_NDK",
'r13b': None,
'r14b': None,
'r15c': None,
'r16b': None,
},
'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'), 'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
'java_paths': None, 'java_paths': None,
'scan_binary': False, 'scan_binary': False,

1
fdroidserver/init.py
View file

@ -226,7 +226,6 @@ def main():
msg = '\n' msg = '\n'
msg += _('Built repo based in "%s" with this config:') % fdroiddir msg += _('Built repo based in "%s" with this config:') % fdroiddir
msg += '\n\n Android SDK:\t\t\t' + config['sdk_path'] msg += '\n\n Android SDK:\t\t\t' + config['sdk_path']
msg += '\n Android NDK r12b (optional):\t$ANDROID_NDK'
msg += '\n ' + _('Keystore for signing key:\t') + keystore msg += '\n ' + _('Keystore for signing key:\t') + keystore
if repo_keyalias is not None: if repo_keyalias is not None:
msg += '\n Alias for key in store:\t' + repo_keyalias msg += '\n Alias for key in store:\t' + repo_keyalias

8
fdroidserver/metadata.py
View file

@ -326,13 +326,7 @@ class Build(dict):
return 'ant' return 'ant'
def ndk_path(self): def ndk_path(self):
version = self.ndk return fdroidserver.common.config['ndk_paths'].get(self.ndk, '')
if not version:
version = 'r12b' # falls back to latest
paths = fdroidserver.common.config['ndk_paths']
if version not in paths:
return ''
return paths[version]
flagtypes = { flagtypes = {