diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-24 13:31:34 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-01-22 13:02:39 +1300 |
| commit | 86d3e59d7014aa2e3bf0da149e4a00e9c2fed7aa (patch) | |
| tree | 84675afade49fe58ccc0ec356443101994d4d8b3 | |
| parent | 55a0bed59f9c0dafb7af320f6ff6a63dd9db7b2a (diff) | |
| download | subsurface-86d3e59d7014aa2e3bf0da149e4a00e9c2fed7aa.tar.gz | |
Android: build both 32 and 64 bit binaries
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 2 | ||||
| -rw-r--r-- | scripts/android/after_success.sh | 4 | ||||
| -rw-r--r-- | scripts/android/before_install.sh | 2 | ||||
| -rw-r--r-- | scripts/android/travisbuild.sh | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index ccdc05ea7..91bb2b7a8 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -149,8 +149,10 @@ rm -df ./subsurface-mobile-build-arm/AndroidManifest.xml if [ "$USE_X" ] ; then bash "$USE_X" "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" + bash "$USE_X" "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 "$@" else bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" + bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 "$@" fi ls -l ./subsurface-mobile-build-arm/build/outputs/apk/*.apk diff --git a/scripts/android/after_success.sh b/scripts/android/after_success.sh index 36219b562..c79988e06 100644 --- a/scripts/android/after_success.sh +++ b/scripts/android/after_success.sh @@ -8,8 +8,8 @@ fi source ${TRAVIS_BUILD_DIR}/scripts/release-message.sh echo "Submitting the folloing apk for continuous build release:" -ls -lh /android/subsurface-mobile-build-arm*/build/outputs/apk/*.apk +ls -lh ../subsurface-mobile-build-arm*/build/outputs/apk/*.apk # get and run the upload script wget -c https://raw.githubusercontent.com/dirkhh/uploadtool/master/upload.sh -bash ./upload.sh /android/subsurface-mobile-build-arm*/build/outputs/apk/*.apk +bash ./upload.sh ../subsurface-mobile-build-arm*/build/outputs/apk/*.apk diff --git a/scripts/android/before_install.sh b/scripts/android/before_install.sh index 2d428b4b6..253708320 100644 --- a/scripts/android/before_install.sh +++ b/scripts/android/before_install.sh @@ -8,6 +8,7 @@ git describe # setup build dir on the host, not inside of the container mkdir -p ../subsurface-mobile-build-arm +mkdir -p ../subsurface-mobile-build-arm64 # this uses a custom built Ubuntu image that includes Qt for Android and # Android NDK/SDK @@ -15,6 +16,7 @@ mkdir -p ../subsurface-mobile-build-arm PARENT="$( cd .. && pwd )" docker run -v $PWD:/android/subsurface \ -v $PARENT/subsurface-mobile-build-arm:/android/subsurface-mobile-build-arm \ + -v $PARENT/subsurface-mobile-build-arm64:/android/subsurface-mobile-build-arm64 \ --name=builder \ -w /android \ -d dirkhh/android-builder:5.12.02 \ diff --git a/scripts/android/travisbuild.sh b/scripts/android/travisbuild.sh index 6d8397e40..c76fb976b 100644 --- a/scripts/android/travisbuild.sh +++ b/scripts/android/travisbuild.sh @@ -8,4 +8,4 @@ set -e # (but of course having the right things in place will save a ton of time) docker exec -e TRAVIS="$TRAVIS" -t builder subsurface/packaging/android/android-build-wrapper.sh -ls -l ../subsurface-mobile-build-arm/build/outputs/apk/ +ls -l ../subsurface-mobile-build-arm*/build/outputs/apk/ |