mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildserver: use standardized paths for the NDKs

Browse source 
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
This commit is contained in:
Hans-Christoph Steiner 2021-05-25 22:39:03 +02:00
parent bb77d7a6d2
commit 93145a43fb
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/common.py
View file

@ -4006,9 +4006,9 @@ def auto_install_ndk(build):
--onserver` calls can run in a single session. The production
buildserver is reset between every build.
The default ANDROID_HOME base dir of /home/vagrant/android-sdk is
hard-coded in buildserver/Vagrantfile. The "ndk" subdir is where
Android Studio will install the NDK into versioned subdirs.
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
Also, r10e and older cannot be handled via this mechanism because