From 9d27df7e10ec245c3542f0d44d96a81c8d3864bc Mon Sep 17 00:00:00 2001 From: Samantaz Fox Date: Wed, 11 Jun 2025 05:53:36 +0000 Subject: [PATCH 1/2] Fix: Use ANDROID_SDK_ROOT everywhere in build.sh The signing section was using $HOME/Android/Sdk instead of $ANDROID_SDK_ROOT, preventing from signing the APK if the Android SDK is not installed at the default location. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index d7168d018..03e2e5415 100755 --- a/build.sh +++ b/build.sh @@ -39,13 +39,13 @@ else KEYSTORE_ALIAS=catima fi - apksigner_version="$(ls -1 "$HOME/Android/Sdk/build-tools/" | tail -n 1)" + apksigner_version="$(ls -1 "$ANDROID_SDK_ROOT/build-tools/" | tail -n 1)" for flavourDir in $flavourDirs; do flavourName="$(basename "$flavourDir")" echo "Signing $flavourName flavour..." cp "$flavourDir/release/app-$flavourName-release-unsigned.apk" "$flavourDir/release/app-$flavourName-release.apk" - "$HOME/Android/Sdk/build-tools/$apksigner_version/apksigner" sign -v --ks "$KEYSTORE" --ks-key-alias "$KEYSTORE_ALIAS" "$flavourDir/release/app-$flavourName-release.apk" + "$ANDROID_SDK_ROOT/build-tools/$apksigner_version/apksigner" sign -v --ks "$KEYSTORE" --ks-key-alias "$KEYSTORE_ALIAS" "$flavourDir/release/app-$flavourName-release.apk" echo "Build finished (signed)" echo "Your $flavourName flavour is at $flavourDir/release/app-$flavourName-release.apk" From 5f8e7ab70223762b7a14095d5117ffacde7ecc7d Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Thu, 12 Jun 2025 18:51:43 +0200 Subject: [PATCH 2/2] Replace deprecated ANDROID_SDK_ROOT with ANDROID_HOME var --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 03e2e5415..972e38d99 100755 --- a/build.sh +++ b/build.sh @@ -5,9 +5,9 @@ IFS=$'\n\t' ### build.sh ### Builds Catima the same way rbtlog/IzzyOnDroid does for reproducible builds -if [ -z "${ANDROID_SDK_ROOT:-}" ]; then - echo "ANDROID_SDK_ROOT is not set, setting to $HOME/Android/Sdk"; - export ANDROID_SDK_ROOT=$HOME/Android/Sdk +if [ -z "${ANDROID_HOME:-}" ]; then + echo "ANDROID_HOME is not set, setting to $HOME/Android/Sdk"; + export ANDROID_HOME=$HOME/Android/Sdk fi if [ -z "${JAVA_HOME:-}" ]; then @@ -39,13 +39,13 @@ else KEYSTORE_ALIAS=catima fi - apksigner_version="$(ls -1 "$ANDROID_SDK_ROOT/build-tools/" | tail -n 1)" + apksigner_version="$(ls -1 "$ANDROID_HOME/build-tools/" | tail -n 1)" for flavourDir in $flavourDirs; do flavourName="$(basename "$flavourDir")" echo "Signing $flavourName flavour..." cp "$flavourDir/release/app-$flavourName-release-unsigned.apk" "$flavourDir/release/app-$flavourName-release.apk" - "$ANDROID_SDK_ROOT/build-tools/$apksigner_version/apksigner" sign -v --ks "$KEYSTORE" --ks-key-alias "$KEYSTORE_ALIAS" "$flavourDir/release/app-$flavourName-release.apk" + "$ANDROID_HOME/build-tools/$apksigner_version/apksigner" sign -v --ks "$KEYSTORE" --ks-key-alias "$KEYSTORE_ALIAS" "$flavourDir/release/app-$flavourName-release.apk" echo "Build finished (signed)" echo "Your $flavourName flavour is at $flavourDir/release/app-$flavourName-release.apk"