subsurface.git/packaging/android, branch v4.8.4forked from https://github.com/subsurface/subsurfacehttps://git.tsegers.com/subsurface.git/atom?h=v4.8.42018-11-13T09:17:54ZAndroid: pick the correct C++ runtime2018-11-13T09:17:54ZDirk Hohndeldirk@hohndel.org2018-11-13T09:17:54Zurn:sha1:9da3988ec6529c4730c4cf274d37d5b116971630
Yet another fallout of the switch to the NDK toolchain.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: build for android-162018-11-13T08:45:29ZDirk Hohndeldirk@hohndel.org2018-11-13T08:45:27Zurn:sha1:c608cfd643e247130e30f93e2bda86623da4e430
That's the minimum platform that we have used for a while now,
corresponding to Android 4.1 and newer (i.e., quite ancient).
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: explicitly build with gcc2018-11-13T07:51:17ZDirk Hohndeldirk@hohndel.org2018-11-13T05:33:00Zurn:sha1:a58cd3eb1395f87ecfe396f6ff42952a56aef257
Our Android build currently fails with clang.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: qt-android-cmake no longer ships a toolchain file2018-11-13T05:16:29ZDirk Hohndeldirk@hohndel.org2018-11-13T05:16:29Zurn:sha1:1868bd38b6958d4bccefd64759b63e360ae6524a
Instead use the one that comes as part of the NDK.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
build-system: switch back to upstream qt-android-cmake2018-10-27T14:38:39ZDirk Hohndeldirk@hohndel.org2018-10-27T14:01:00Zurn:sha1:651f63282fd82e4f04b3edd6bfe987a88b746525
And in the process use our script to do the work.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: whitespace change to build.sh2018-08-06T03:39:27ZDirk Hohndeldirk@hohndel.org2018-08-06T03:14:43Zurn:sha1:289e1cc37e5d91ef65b9a212ce6a0eb84a97fc77
This indents the code that is only executed when we aren't in 'quick'
mode. git show -w will show that there is no code change in this commit.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: add -quick flag to build.sh2018-08-06T03:39:21ZDirk Hohndeldirk@hohndel.org2018-08-06T03:12:16Zurn:sha1:35ffd5f71ee21d9f69103a1eaf1d6cef3faa1941
This allows us to skip all the checking / building of dependency
libraries. This also allows us to pass extra arguments to the make
command by separating them from the arguments to build.sh with '--'.
This commit is easier to understand because it didn't increase the
indent in the large block of code that is now only executed if we aren't
in 'quick' mode. That will be fixed in the next commit that is
whitespace only.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: use our fork of qt-android-cmake2018-08-05T22:09:44ZDirk Hohndeldirk@hohndel.org2018-08-05T22:09:44Zurn:sha1:81ca29e688d941cb02a350201d0ad7481b816aee
This tells androiddeployqt to look at the qml modules to find all
dependencies.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: build latest libzip2018-08-05T22:08:19ZDirk Hohndeldirk@hohndel.org2018-08-05T22:07:46Zurn:sha1:32a630ece3b4612ef1b8a76d6cabbe8991e85025
Small hacks needed, but otherwise this seems to work.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: build libzip 1.1.32018-08-04T21:32:16ZDirk Hohndeldirk@hohndel.org2018-08-04T21:30:42Zurn:sha1:93983b7e4c0ad72c61c98a87132c6274b4640c16
Switching to GitHub as source for libzip means that we need to encode
the version number differently. Newer versions of libzip don't compile
cleanly on Android and this one seems new enough.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>