mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

android-build: Stop installing ant, we're using grade

Browse source 
Since about a year ago qt-android-cmake shifted to using gradle instead
of ant, and the android sdk's stopped supporting ant to.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2018-05-14 22:54:29 +02:00 • committed by Dirk Hohndel
parent 05e6c2dfaa
commit 75205240df
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/android-build-wrapper.sh
View file

@ -46,7 +46,7 @@ fi
# make sure we have the required commands installed # make sure we have the required commands installed
MISSING= MISSING=
for i in git cmake autoconf libtool java ant wget unzip; do for i in git cmake autoconf libtool java wget unzip; do
command -v $i >/dev/null || command -v $i >/dev/null ||
if [ $i = libtool ] ; then if [ $i = libtool ] ; then
MISSING="${MISSING}libtool-bin " MISSING="${MISSING}libtool-bin "

2
scripts/android/before_install.sh
View file

@ -10,7 +10,7 @@ git describe
docker run -v $PWD:/workspace/subsurface --name=builder -w /workspace -d ubuntu:xenial /bin/sleep 60m docker run -v $PWD:/workspace/subsurface --name=builder -w /workspace -d ubuntu:xenial /bin/sleep 60m
docker exec -t builder apt-get update docker exec -t builder apt-get update
# subsurface android build dependencies # subsurface android build dependencies
docker exec -t builder apt-get install -y git cmake autoconf libtool-bin openjdk-8-jdk-headless ant wget unzip python bzip2 pkg-config docker exec -t builder apt-get install -y git cmake autoconf libtool-bin openjdk-8-jdk-headless wget unzip python bzip2 pkg-config
# Qt installer dependencies # Qt installer dependencies
docker exec -t builder apt-get install -y libx11-xcb1 libgl1-mesa-glx libglib2.0-0 docker exec -t builder apt-get install -y libx11-xcb1 libgl1-mesa-glx libglib2.0-0
# Inject cached 3pp's (if none exists in 3pp dir, we inject zero ones, and all is downloaded in the container) # Inject cached 3pp's (if none exists in 3pp dir, we inject zero ones, and all is downloaded in the container)