diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2018-05-14 22:54:29 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-05-17 07:36:44 -0700 |
| commit | 75205240dfe42a35622b5a07569d06cd88cc8b34 (patch) | |
| tree | e8a9d78bf1965e247cb559819ef90253744b9abf | |
| parent | 05e6c2dfaa0280dd1a098d1ade66dce389402b6a (diff) | |
| download | subsurface-75205240dfe42a35622b5a07569d06cd88cc8b34.tar.gz | |
android-build: Stop installing ant, we're using grade
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>
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 2 | ||||
| -rw-r--r-- | scripts/android/before_install.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 2349bada8..3c024ba17 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -46,7 +46,7 @@ fi # make sure we have the required commands installed 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 || if [ $i = libtool ] ; then MISSING="${MISSING}libtool-bin " diff --git a/scripts/android/before_install.sh b/scripts/android/before_install.sh index 14b7cb4ff..48c1e8bf7 100644 --- a/scripts/android/before_install.sh +++ b/scripts/android/before_install.sh @@ -10,7 +10,7 @@ git describe docker run -v $PWD:/workspace/subsurface --name=builder -w /workspace -d ubuntu:xenial /bin/sleep 60m docker exec -t builder apt-get update # 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 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) |