From c928f762f964e5d4b434448e75ad8622811ed26a Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 6 Jan 2021 01:00:04 +0200 Subject: [PATCH] SDL: zipalign will refuse to align signed debug build, make it not an error --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index ad303c302..fa9d1df34 100755 --- a/build.sh +++ b/build.sh @@ -159,7 +159,7 @@ cd project && env PATH=$NDKBUILDPATH BUILD_NUM_CPUS=$NCPU ndk-build -j$NCPU V=1 } || exit 1 ; \ ../copyAssets.sh pack-binaries app/build/outputs/apk/release/app-release-unsigned.apk ; \ 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 ; \ + zipalign 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk ; \ 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 || exit 1 ; \ @@ -169,9 +169,9 @@ cd project && env PATH=$NDKBUILDPATH BUILD_NUM_CPUS=$NCPU ndk-build -j$NCPU V=1 cd ../../.. ; \ } || exit 1 ; \ mkdir -p app/build/outputs/apk/release ; \ - ../copyAssets.sh pack-binaries app/build/outputs/apk/debug/app-debug.apk && \ - rm -f app/build/outputs/apk/release/app-release.apk && \ - zipalign 4 app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/release/app-release.apk && + ../copyAssets.sh pack-binaries app/build/outputs/apk/debug/app-debug.apk ; \ + rm -f app/build/outputs/apk/release/app-release.apk ; \ + zipalign 4 app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/release/app-release.apk ; \ apksigner sign --ks ~/.android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android app/build/outputs/apk/release/app-release.apk || exit 1 ; \ fi ; } && \ { if $sign_apk; then cd .. && ./sign.sh && cd project ; else true ; fi ; } && \