summaryrefslogtreecommitdiffstats
path: root/packaging/android/android-build-wrapper.sh
AgeCommit message (Collapse)Author
2019-10-02Android: allow passing through -quick argumentGravatar Dirk Hohndel
So even setups relying on the wrapper script can do faster rebuilds. This also cleans up a bug that made passing through the release parameter fail in the past, and removes overly verbose debugging output. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-21Android: bundle default font for use in OnePlus devicesGravatar Dirk Hohndel
This is working around a Qt Bug https://bugreports.qt.io/browse/QTBUG-69494 which prevents correct rendering of the OnePlus fonts. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-07-19Android: ensure higher build number for arm64 APKGravatar Dirk Hohndel
Google Play allows uploading two APKs, but only if the arm64 one has a higher build number. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-07-18Android: fix location of the build apksGravatar Jan Mulder
With all upgrading, the build apks now show up in a slightly different location. Correct this in the scripting. Notice that this is debug building only. Release building is outside the repo. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2019-03-05simplify sed hacking of Qt CMake filesGravatar Rolf Eike Beer
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-01-25Android: accept 'Release' argumentGravatar Dirk Hohndel
This is mostly an artifact of how I build release packages. Otherwise this likely isn't important. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-01-21Android: make sure we have the correct platforms installedGravatar Dirk Hohndel
This should fix the current Travis build failures for Android. It is odd how we have ANDROID_PLATFORM and ANDROID_PLATFORMS, buf for now all I care about is that the Travis build completes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-12-30Android build: always reconfigure libdivecomputerGravatar Jan Mulder
This fix makes no difference from usage of this script in Travis context, as every build starts from a clean VM, but the very few developers that build for Android locally, and that want to use the new style docker container builds as well, things are broken. libdivecomputer has build artifacts in its source tree (and that source tree is shared between local and docker run). So it happens that libdivecomputer is configured locally, and afterwards fails to build in docker build as its already configured, but not for the docker image its now running in. The fix is simple. Always reconfigure libdivecomputer when using this script. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-12-30Android: build both 32 and 64 bit binariesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-12-30Travis: Android build wrapper now runs inside our containerGravatar Dirk Hohndel
So we don't need the pre-built binaries anymore, and we don't need the travis_wait hack anymore for potentially slow downloads as that is all installed in the container already. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-12-30Android: update for Qt 5.12.0Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-12-30Android: cleanup build wrapper scriptGravatar Dirk Hohndel
This way it can be run both to create the docker container or independently for a full build. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-12-30Android: allow running android-build-wrapper without buildingGravatar Dirk Hohndel
This way we can use it to fetch dependencies we need up front. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-12-06Android build: explicitly install using sdkmanagerGravatar Jan Mulder
Make sure all required Android SDK components are explicitly installed before starting the actual build. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-07-09Travis: build Android against Qt 5.11.1Gravatar Dirk Hohndel
Instead of dealing with the challenges of downloading and installing the official package (which really prefers to be run interactively and frequently caused Travis failures) we get the pre-packed bits from our cache instead. Less data to transfer, quicker install. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-04ShellcheckGravatar Joakim Bygdell
Code cleanup using shellcheck. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-04Update android build env.Gravatar Joakim Bygdell
Update the scripts used to build subsurface-mobile for andriod to use the variables file. Removed checks for obsolete Qt versions. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-03build-system: tell Travis to wait longer for downloadsGravatar Dirk Hohndel
But simply ignore when building outside of Travis. Of course since we are building Android in a container, we need to first pass the environment variable to the container... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-17android-build: Stop installing ant, we're using gradeGravatar Anton Lundin
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>
2018-03-19Android build: switch to Qt 5.10.1Gravatar Dirk Hohndel
That's what we now use for the official binaries as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-02-24Android build: use Qt 5.9.3Gravatar Jan Mulder
At least, now the Travis builds use the same Qt version as the production builds from Dirk that go to the AppStores. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-12-24Travis: hack around Android build failuersGravatar Dirk Hohndel
For some reason accepting the licenses for the SDK appears to fail. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-24Android build: reorder downloading Qt vs SDKGravatar Dirk Hohndel
Since it's the SDK where things are failing, doing it this way makes the turnaround time of my attempts to fix this faster. And in the larger scheme of things, the order is irrelevant. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-06Android build: fix android-build-wrapper.shGravatar Dirk Hohndel
I clearly had forgotten to update the Android specific scripts when adding the libdivecomputer submodule. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-16android: Don't re-clone subsurface in android-build-wrapper.shGravatar Anton Lundin
Just use the source tree you where called from instead. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Correct path to Qt binariesGravatar Anton Lundin
Back in 6451adfec11262c3522878e700cb6794df8ee3d2, the path to the qt binaries was changed. The current binaries are back on the old urls, so this reverts half of 6451adfec11262c3522878e700cb6794df8ee3d2. The other half is still true. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Remove unneeded extra argument parsingGravatar Anton Lundin
This is handled by build.sh, which handles it correctly for running with set -u. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Install android sdk on a different wayGravatar Anton Lundin
This way we can auto-accept all the licenses. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Ensure rm exits zeroGravatar Anton Lundin
This is to comply with set -e Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Remove unset variable VERSIONGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Increase BUILDNR with zero exit statusGravatar Anton Lundin
This increases BUILDNR in a way that keeps exit status as zero, so the script doesn't abort due to set -e. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Allow Qt install in headless modeGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: make android-build-wrapper.sh executableGravatar Anton Lundin
2017-06-30Android build: switch to Qt 5.9.1Gravatar Dirk Hohndel
It seems that the Qt team deviated from their previous practice to keep the Qt/x.y directory structure the same for all minor releases - so now it is indeed Qt/5.9.1 Oh well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21Android build: match versions between wrapper and build scriptGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-05-31Android build script: use interactive SDK installGravatar Dirk Hohndel
And then manually fix the license as that doesn't appear to work correctly in the tool. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-05-31Android build script: update for Qt 5.9Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-05-27Update Android build scriptsGravatar Dirk Hohndel
- prepare for Qt 5.9 - remove references to ANT - adjust to changed location of the resulting apk Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-16Change protocoll for any git clone from Github to httpsGravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-20Android build: extend comment for Qt5.8Gravatar Jan Mulder
Just an update of comment. The stange issue with Qt5.7.1 is still present in Qt5.8. Extend the comment accordingly. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-02-09Simplify some testsGravatar Cristian Ionescu-Idbohrn
Because `[ "$foo" != "" ] is equivalent to `[ "$foo" ]' in all POSIX shells. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-09Remove useless quotesGravatar Cristian Ionescu-Idbohrn
Don't quote if you don't have to. Spend those cpu cycles on doing something more useful, instead. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-09Use `command' (shell builtin and POSIX) insteadGravatar Cristian Ionescu-Idbohrn
The `which' command is a fork and possible not standard in various distributions, or builtin in certain (odd)? shells, like `zsh'. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Auto install QtGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android: Upgrade Qt to 5.8Gravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android: Move suggested/expected Qt install to just QtGravatar Anton Lundin
In the Qt installer, there is a MaintenanceTool which can upgrade your install, so don't install in a "versioned" directory, just install in a plain Qt-directory. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Auto accept android sdk licenseGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Quiet down unzipGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Quiet down wgetGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Add unzip as prerequisiteGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>