From bb46839637484ab7408248ef250061b80abfd2fa Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 25 Feb 2019 19:39:18 +0200 Subject: [PATCH] SDL: fixed path to .apk file in build script --- app-release.apk | 2 +- build.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app-release.apk b/app-release.apk index 076db83fa..3c6429493 120000 --- a/app-release.apk +++ b/app-release.apk @@ -1 +1 @@ -project/app/build/outputs/apk/app-release.apk \ No newline at end of file +project/app/build/outputs/apk/release/app-release.apk \ No newline at end of file diff --git a/build.sh b/build.sh index 7f388572f..9895164b7 100755 --- a/build.sh +++ b/build.sh @@ -148,25 +148,25 @@ cd project && env PATH=$NDKBUILDPATH BUILD_NUM_CPUS=$NCPU ndk-build -j$NCPU V=1 { if $build_release ; then \ $quick_rebuild && { \ ln -s -f libs lib ; \ - zip -u -r app/build/outputs/apk/app-release-unsigned.apk lib assets || exit 1 ; \ + zip -u -r app/build/outputs/apk/release/app-release-unsigned.apk lib assets || exit 1 ; \ } || ./gradlew assembleRelease || exit 1 ; \ [ '!' -x jni/application/src/AndroidPostBuild.sh ] || { cd jni/application/src ; \ - ./AndroidPostBuild.sh `pwd`/../../../app/build/outputs/apk/app-release-unsigned.apk || exit 1 ; \ + ./AndroidPostBuild.sh `pwd`/../../../app/build/outputs/apk/release/app-release-unsigned.apk || exit 1 ; \ cd ../../.. ; \ } || exit 1 ; \ - rm -f app/build/outputs/apk/app-release.apk ; \ - zipalign 4 app/build/outputs/apk/app-release-unsigned.apk app/build/outputs/apk/app-release.apk || exit 1 ; \ - apksigner sign --ks ~/.android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android app/build/outputs/apk/app-release.apk || exit 1 ; \ + rm -f app/build/outputs/apk/release/app-release.apk ; \ + zipalign 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk || exit 1 ; \ + apksigner sign --ks ~/.android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android app/build/outputs/apk/release/app-release.apk || exit 1 ; \ else \ ./gradlew assembleDebug && \ - mv -f app/build/outputs/apk/app-debug.apk app/build/outputs/apk/app-release.apk \ + mv -f app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/release/app-release.apk \ || exit 1 ; \ fi ; } && \ { if $sign_apk; then cd .. && ./sign.sh && cd project ; else true ; fi ; } && \ { $install_apk && [ -n "`adb devices | tail -n +2`" ] && \ - { adb install -r app/build/outputs/apk/app-release.apk | grep 'Failure' && \ - adb uninstall `grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r app/build/outputs/apk/app-release.apk ; } ; \ + { adb install -r app/build/outputs/apk/release/app-release.apk | grep 'Failure' && \ + adb uninstall `grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r app/build/outputs/apk/release/app-release.apk ; } ; \ true ; } && \ { $run_apk && { \ ActivityName="`grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//'`/.MainActivity" ; \