miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: fixed path to .apk file in build script

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-02-25 19:39:18 +02:00
parent 22a34468d2
commit bb46839637
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-release.apk
View File

@@ -1 +1 @@
project/app/build/outputs/apk/app-release.apk project/app/build/outputs/apk/release/app-release.apk

16
build.sh
View File

@@ -148,25 +148,25 @@ cd project && env PATH=$NDKBUILDPATH BUILD_NUM_CPUS=$NCPU ndk-build -j$NCPU V=1
{ if $build_release ; then \ { if $build_release ; then \
$quick_rebuild && { \ $quick_rebuild && { \
ln -s -f libs lib ; \ 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 ; \ } || ./gradlew assembleRelease || exit 1 ; \
[ '!' -x jni/application/src/AndroidPostBuild.sh ] || { [ '!' -x jni/application/src/AndroidPostBuild.sh ] || {
cd jni/application/src ; \ 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 ../../.. ; \ cd ../../.. ; \
} || exit 1 ; \ } || exit 1 ; \
rm -f app/build/outputs/apk/app-release.apk ; \ rm -f app/build/outputs/apk/release/app-release.apk ; \
zipalign 4 app/build/outputs/apk/app-release-unsigned.apk app/build/outputs/apk/app-release.apk || exit 1 ; \ 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/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 \ else \
./gradlew assembleDebug && \ ./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 ; \ || exit 1 ; \
fi ; } && \ fi ; } && \
{ if $sign_apk; then cd .. && ./sign.sh && cd project ; else true ; fi ; } && \ { if $sign_apk; then cd .. && ./sign.sh && cd project ; else true ; fi ; } && \
{ $install_apk && [ -n "`adb devices | tail -n +2`" ] && \ { $install_apk && [ -n "`adb devices | tail -n +2`" ] && \
{ adb install -r app/build/outputs/apk/app-release.apk | grep 'Failure' && \ { 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/app-release.apk ; } ; \ adb uninstall `grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r app/build/outputs/apk/release/app-release.apk ; } ; \
true ; } && \ true ; } && \
{ $run_apk && { \ { $run_apk && { \
ActivityName="`grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//'`/.MainActivity" ; \ ActivityName="`grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//'`/.MainActivity" ; \