buildserver: extract NDK rather than executing it

Then the NDK archive doesn't need execute permissions.
2026-01-26 08:18:58 -05:00 · 2016-06-15 14:25:22 +02:00
parent 14b702b23b
commit 721b3b79a6
2 changed files with 4 additions and 3 deletions
--- a/buildserver/cookbooks/android-ndk/recipes/default.rb
+++ b/buildserver/cookbooks/android-ndk/recipes/default.rb
@@ -41,9 +41,9 @@ script "setup-android-ndk-r10e" do
    else
       SUFFIX=''
    fi
-    chmod u+x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin
-    /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin x
-    mv android-ndk-r10e #{ndk_loc}/r10e
+    cd #{ndk_loc}
+    7zr x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin
+    mv android-ndk-r10e r10e
  "
  not_if "test -d #{ndk_loc}/r10e"
 end
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -54,6 +54,7 @@ end
    openjdk-7-jdk
    openjdk-8-jdk
    optipng
+    p7zip
    pandoc
    perlmagick
    pkg-config