diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 4 | ||||
| -rw-r--r-- | scripts/android/after_success.sh | 4 | ||||
| -rw-r--r-- | scripts/android/travisbuild.sh | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -346,4 +346,4 @@ This will download and install the required NDK, SDK and Qt required to build th After that, you can run: ./subsurface/packaging/android/build.sh everytime you want to build a new version. -This will generate an apk file in ./subsurface-mobile-build-arm/build/outputs/apk/ +This will generate an apk file in ./subsurface-mobile-build-arm/build/outputs/apk/debug diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 2e5ee6c1c..3bcac04c1 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -149,7 +149,7 @@ echo "${BUILDNR}" > ./buildnr.dat echo "Building Subsurface-mobile for Android, build nr ${BUILDNR}" -rm -f ./subsurface-mobile-build-arm/build/outputs/apk/*.apk +rm -f ./subsurface-mobile-build-arm/build/outputs/apk/debug/*.apk rm -df ./subsurface-mobile-build-arm/AndroidManifest.xml if [ "$USE_X" ] ; then @@ -160,5 +160,5 @@ else bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 "$@" fi -ls -l ./subsurface-mobile-build-arm/build/outputs/apk/*.apk +ls -l ./subsurface-mobile-build-arm/build/outputs/apk/debug/*.apk diff --git a/scripts/android/after_success.sh b/scripts/android/after_success.sh index 702cb9660..9ee5d2c33 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 ../subsurface-mobile-build-docker-arm*/build/outputs/apk/*.apk +ls -lh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/debug/*.apk # get and run the upload script wget -c https://raw.githubusercontent.com/dirkhh/uploadtool/master/upload.sh -bash ./upload.sh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/*.apk +bash ./upload.sh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/debug/*.apk diff --git a/scripts/android/travisbuild.sh b/scripts/android/travisbuild.sh index b11aca482..b7fe5fa8d 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 android-builder subsurface/packaging/android/android-build-wrapper.sh -ls -l ../subsurface-mobile-build-docker-arm*/build/outputs/apk/ +ls -l ../subsurface-mobile-build-docker-arm*/build/outputs/apk/debug |