summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2019-07-17 09:03:48 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-07-18 06:39:00 -0700
commit29f4d35bc429891a735855725ed6c620a04e242c (patch)
tree984ea38a2e157602f0fea816e4d85eebd7578dfc /scripts
parent7c722ea22244c30c27fb1d464d011907fd86b1bb (diff)
downloadsubsurface-29f4d35bc429891a735855725ed6c620a04e242c.tar.gz
Android: fix location of the build apks
With all upgrading, the build apks now show up in a slightly different location. Correct this in the scripting. Notice that this is debug building only. Release building is outside the repo. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/android/after_success.sh4
-rw-r--r--scripts/android/travisbuild.sh2
2 files changed, 3 insertions, 3 deletions
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