9 Commits

Author	SHA1	Message	Date
Jochen Sprickerhof	c208582e75	Drop old java_paths	2022-10-10 21:22:59 +02:00
Hans-Christoph Steiner	9f77044d0d	auto-detect NDKs installed in standard paths ... 'ndk_paths' will be automatically filled out from well known sources like $ANDROID_HOME/ndk-bundle and $ANDROID_HOME/ndk/*. If a required version is missing in the buildserver VM, it will be automatically downloaded and installed into the standard $ANDROID_HOME/ndk/ directory. Manually setting it here will override the auto-detected values. The keys can either be the "release" (e.g. r21e) or the "revision" (e.g. 21.4.7075529). https://developer.android.com/studio/projects/configure-agp-ndk#agp_version_41 * sdkmanager installs "ndk;12.3.4567890" into $ANDROID_SDK_ROOT/ndk/ * sdkmanager installs "ndk-bundle" into $ANDROID_SDK_ROOT/ndk-bundle/	2021-05-28 09:13:34 +02:00
Hans-Christoph Steiner	93145a43fb	buildserver: use standardized paths for the NDKs ... This should help with reproducibility since some tools like Python still include the build paths in the binaries. https://gitlab.com/fdroid/fdroidserver/-/merge_requests/919#note_578180986 The default ANDROID_SDK_ROOT base dir of /opt/android-sdk is hard-coded in buildserver/Vagrantfile. The $ANDROID_HOME/ndk subdir is where Android Studio will install the NDK into versioned subdirs. https://developer.android.com/studio/projects/configure-agp-ndk#agp_version_41	2021-05-26 09:21:52 +02:00
Hans-Christoph Steiner	bb77d7a6d2	buildserver: standardize SDK install location /opt/android-sdk ... _/opt/android-sdk_ was chosen for a number of reasons: * _/opt_ is [standardized][1] for packages like the Android SDK, which has its own directory layout. * _android-sdk_ is used rather than the upstream directory name from the ZIP (e.g. _android-sdk-linux_) so that the path is the same on all platforms. * On platforms without official _/opt_ support ([macOS][2], [Windows][3], [FreeBSD][4], etc.), it does not conflict with any existing system directory. [1]: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s13.html [2]: https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/FileSystemOverview/FileSystemOverview.html#//apple_ref/doc/uid/TP40010672-CH2-SW7 [3]: https://en.wikipedia.org/wiki/Directory_structure#Windows_10 [4]: https://www.freebsd.org/cgi/man.cgi?query=hier&sektion=7&format=html	2021-05-25 17:30:32 +02:00
Hans-Christoph Steiner	ec2cace222	buildserver: trim pre-installed NDK list down to the bare minimum ... This keeps the Long Term Support release and the latest release installed. r10e was kept in because it needs a special extraction method, since it is a .bin file, not a .zip. r12b is kept in because it is the old default. Here is a survey of the NDK versions used in the most recent Builds entry in each app that uses the NDK: {'r10e': 6, 'r12b': 93, 'r13b': 4, 'r14b': 5, 'r15c': 7, 'r16b': 14, 'r17b': 4, 'r17c': 7, 'r18b': 9, 'r19c': 17, 'r20': 1, 'r20b': 22, 'r21': 3, 'r21d': 56, 'r21e': 65, 'r22': 9, 'r22b': 15, 'r9b': 1} #517 import glob import os import yaml try: from yaml import CSafeLoader as SafeLoader except ImportError: from yaml import SafeLoader ndks = dict() for f in glob.glob('metadata/*.yml'): with open(f) as fp: app = yaml.load(fp, Loader=SafeLoader) if app.get('Disable'): continue build = app.get('Builds', [])[-1] if build.get('disabled'): continue ndk = build.get('ndk') if ndk and ndk[1] == '9': print(f, build) elif ndk and int(ndk[2:3]) < 18: print(f, build) if ndk: print(f, ndk) if ndk not in ndks: ndks[ndk] = 0 ndks[ndk] += 1 import pprint pprint.pprint(ndks)	2021-05-25 17:06:28 +02:00
relan	6d9410597b	Upgrade NDK r22 to r22b	2021-04-07 12:12:04 +03:00
Licaon_Kter	d683a40f96	Add NDK 21e	2021-03-10 16:36:14 +02:00
TacoTheDank	c88a3f56a1	Update NDK to r22 and add buildtools 30.0.3	2020-12-26 19:51:22 -05:00
Hans-Christoph Steiner	a9fdb5b401	init: switch to config.yml as the default format	2020-10-23 14:20:49 +02:00