aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/android/build.sh
AgeCommit message (Collapse)Author
2017-09-04remove Marble from packaging and build scriptsGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> --- please note, that i have no way to test most of the scripts ATM.
2017-07-29Use same libgit2 on AndroidGravatar Jan Mulder
Just to be sure. Use the same version on Android build of libgit2 as used in the scripts/build.sh script. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-07-19Android compile fixGravatar Jan Mulder
Forgotten slash broke my Andorid build (with Qt from source). Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-07-06Enable building with standard Qt install path layoutGravatar Alex Blasche
In general this patch enables building of subsurface without being forced to use the official Qt binary packages. This is particularly helpful when having to debug Qt internals or having to deal with custom patches on top of the official Qt releases. The architecture dependent file path layout is only employed by official Qt binary packages. They are the result of a reordering at package generation time. If Qt was build for a single architecture, the standard layout does not add the architecture specific top level patch for the resulting binaries. Signed-off-by: Alex Blasche <alexander.blasche@qt.io>
2017-07-06Remove obsolete QT5_ANDROID_BINGravatar Alex Blasche
Signed-off-by: Alex Blasche <alexander.blasche@qt.io>
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: work around odd build problem with missing rand()Gravatar Dirk Hohndel
I don't quite understand why this isn't correctly substituted to lrand48() by the header file, but patching it in the source is easy enough. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21Upgrade 3pp for android and testingGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
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-05-27Android build: Add BUILDTOOLS_REVISIONGravatar Jan Mulder
The used cmake toolkit for building the Android Subsurface-mobile app (qt-android-cmake) recently moved away from compiling with Ant in favor of Gradle. The most recent Android SDK will not support Ant any more. This calls for the addition of the Android SDK BUILDTOOLS_REVISION define to the cmake of Subsurface-mobile. Without this, the build will fail. The value has to be set to an existing directory in .../android-sdk/build-tools/ Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-04-16Change protocoll for any git clone from Github to httpsGravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-02-07Fix syntax error in android/build.shGravatar Willem Ferguson
Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android: Rework build.shGravatar Anton Lundin
This reworks build.sh for proper argument parsing and variable quoting. 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-01-21Android build.sh: fix libcrypto dependency in libsslGravatar Dirk Hohndel
Using a binary patch seems harch, but it also seems to work. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-21Android build.sh: don't try to link against host http_parserGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-21Small fix for Android build.shGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-12android: Document controlling env-varsGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-01-12android: build.sh white space cleanupGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-01-12android: Introduce propper quoting in build.shGravatar Anton Lundin
This where quoting issues found by shellcheck. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-01-02Android build: add comments on filesystem layoutGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-28android: Copy android files to the expected nameGravatar Anton Lundin
android-mobile nowadays hardcoded in CMakeLists.txt, so workaround it here. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-28android: Upgrade suggested ndkGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-28Android build: don't try to bundle libssh2, eitherGravatar Dirk Hohndel
Since we don't link against it, no need to bundle it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-28Android build: don't link against libssh2Gravatar Dirk Hohndel
We don't use ssh-based git in Subsurface-mobile, so there's no reason to link against it. This should hopefully fix the current issues with the Android APK on some devices. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-24Android build: try to create APK that works on Android 7.0Gravatar Dirk Hohndel
It appears that instead of statically linking against ssl/crypto/ssh2, you instead have to dynamically link against it and then bundle the library in the APK. The documentation is not 100% clear and I don't have an Android Nougat device to test this with, so for now this is an attempt. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-18Don't build Kirigami as a libraryGravatar Dirk Hohndel
Just link it directly into Subsurface-mobile. That's what we already do with the qmake file for iOS, now the cmake based builds do the same. This should remove a lot of issues. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-17Android build: compile kirigamiGravatar Joakim Bygdell
Build kirkigami plugin out of source and make sure that we use the same QT version for the plugin and the app. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-14Use kirigami built in static modeGravatar Marco Martin
Now kirigami needs to be built with a C++ plugin. In cases of mobile operating systems such as iOS (and in a lesser measuse, Android) having a proper plugin loaded at runtime may be difficult, so statically link it together with all of its qml files compiled as a qresource inside the static library. Signed-off-by: Marco Martin <notmart@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-07-09android: Fix typo in patching of libssh2Gravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-23android: Update all our dependenciesGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-23android: Enable config via env varsGravatar Anton Lundin
This creates the possibility to pass configuration, where the ndk and sdk is installed, to the build.sh script via environment variables. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-23android: Set version and build for desktop appGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-23android: Remove obsolete commentGravatar Anton Lundin
Since c78e4f we build the mobile and desktop versions with different package id's. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-23android: Prioritize newer Qt version if foundGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-23android: Use a ndk toolchain matching sdk versionGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-23android: Update to latest NDKGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-23Build Subsurface c++ as c++11 codeGravatar Anton Lundin
With Qt 5.7, they started to require c++11 support, and in 5.6.1 some nullptr's showed up in QtAndroidExtras/qandroidfunctions.h, so now we need to compile our c++ code with c++11 support in our compiler. As Thiago pointed out, this effectively "downgrades" GCC 6 from c++14 support to c++11. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-22Allow building Android package against Qt 5.7Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-22Qt 5.7 requires C++11Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-05-04Android build: we don't need the Qt translationsGravatar Dirk Hohndel
Only the Subsurface translation files as needed as the QML UI doesn't display any Qt internal strings. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-05-03Android build: prepare and copy translations into the APKGravatar Dirk Hohndel
And then load them at runtime. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-20Android build: use static libssl / libcryptoGravatar Dirk Hohndel
Android M does not allow using those as shared libraries. See #1029 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-14Set default build number for apk buildingGravatar Miika Turkia
Having build number as mandatory parameter seems unnecessary, thus setting default value (used for andoird:versionCode) to 0. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-14Fix initial build of APKGravatar Miika Turkia
Running subsurface/packaging/android/build.sh after deleting subsurface-mobile-build-arm directory fails for me due to missing ssrf-version.h file. Just ignore if it doesn't exist. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-10Make sure version is freshly generated before extractingGravatar Dirk Hohndel
Oops, so Subsurface-mobile 1.0 (4.5.2.1048) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-10Update Subsurface-mobile version to 1.0.0Gravatar Dirk Hohndel
And make sure the version displayed for Android includes both that version and the build version, which is our regular canonical 4 part version number - so this release will be something like "1.0.0 (4.5.2.1047)" Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-05Android build: pass in build nrGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-05Android build: automate setting the right version numberGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>