mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-15 19:50:29 +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

2
buildserver/Vagrantfile vendored
View file

@ -84,7 +84,7 @@ Vagrant.configure("2") do |config|
args: [configfile['debian_mirror']]
config.vm.provision "shell", path: "provision-android-sdk"
config.vm.provision "shell", path: "provision-android-ndk",
args: ["/home/vagrant/android-ndk"]
args: ["/opt/android-sdk/ndk"]
config.vm.provision "shell", path: "provision-gradle"
end