mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: build both 32 and 64 bit binaries

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-12-24 13:31:34 -08:00
parent ed32331640
commit 6fb135eb46
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/android-build-wrapper.sh
View file

@ -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

4
scripts/android/after_success.sh
View file

@ -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

2
scripts/android/before_install.sh
View file

@ -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 \

2
scripts/android/travisbuild.sh
View file

@ -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/