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

buildserver: do not set NDK env vars, they are handled by fdroid build

Browse source 
`fdroid build` handles setting the NDK env vars since the NDK version can
change depending on the app being build.  Unlike ANDROID_HOME, there is no
single global NDK location.  The NDK installs are all versioned.
This commit is contained in:
Hans-Christoph Steiner 2016-06-17 11:29:00 +02:00
parent a88771cf30
commit 226237c5f7
3 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
makebuildserver
View file

@ -377,10 +377,8 @@ if config['apt_package_cache']:
vagrantfile += """
config.vm.provision "shell" do |shell|
shell.path = "setup-env-vars"
shell.args = ["/home/vagrant/android-sdk", "/home/vagrant/android-ndk"]
end
config.vm.provision "shell", path: "setup-env-vars",
args: ["/home/vagrant/android-sdk"]
config.vm.provision :chef_solo do |chef|
chef.cookbooks_path = "cookbooks"
@ -397,7 +395,8 @@ vagrantfile += """
end
config.vm.provision "shell", path: "provision-android-sdk"
config.vm.provision "shell", path: "provision-android-ndk"
config.vm.provision "shell", path: "provision-android-ndk",
args: ["/home/vagrant/android-ndk"]
config.vm.provision "shell", path: "provision-gradle"
config.vm.provision "file", source: "gradle",
destination: "/opt/gradle/bin/gradle"