add split apks to build output & update signing script to reflect the change

Author: 05nelsonm

sampleapp/build.gradle

@@ -45,6 +45,31 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8
     }
+
+    // https://github.com/guardianproject/tor-android/blob/master/sampletorapp/build.gradle
+    splits {
+
+        // Configures multiple APKs based on ABI. This helps keep the size
+        // down, since PT binaries can be large.
+        abi {
+
+            // Enables building multiple APKs per ABI.
+            enable true
+
+            // By default all ABIs are included, so use reset() and include to specify
+            // that we only want APKs for x86 and x86_64, armeabi-v7a, and arm64-v8a.
+
+            // Resets the list of ABIs that Gradle should create APKs for to none.
+            reset()
+
+            // Specifies a list of ABIs that Gradle should create APKs for.
+            include "x86", "armeabi-v7a", "arm64-v8a", "x86_64"
+
+            // Specify whether or not you wish to also generate a universal APK that
+            // includes _all_ ABIs.
+            universalApk true
+        }
+    }
 }
 
 //repositories {

scripts/sign_sampleapp_release_build.sh

@@ -26,7 +26,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 # Check for pkcs11 config file
 PKCS11_CFG="$DIR/.pkcs11_java.cfg"
-if [ ! -f $PKCS11_CFG ]; then
+if [ ! -f "$PKCS11_CFG" ]; then
   echo "File not found:"
   echo "$PKCS11_CFG"
   exit 1
@@ -35,7 +35,7 @@ fi
 # Get Build Tools Version from project's /gradle/dependencies.gradle file
 FILE="$DIR/../gradle/dependencies.gradle"
 
-if [ ! -f $FILE ]; then
+if [ ! -f "$FILE" ]; then
   echo "File not found:"
   echo "$FILE"
   exit 1
@@ -51,44 +51,42 @@ MAX_SDK_VERSION=$(cat $FILE | grep 'compileSdk' | grep -o '[[:digit:]]*')
 
 # Locate unsigned release
 UNSIGNED_APK_DIR="$DIR/../sampleapp/build/outputs/apk/release"
-UNSIGNED_APK="$UNSIGNED_APK_DIR/sampleapp-release-unsigned.apk"
-
-if [ ! -f $UNSIGNED_APK ]; then
-  echo "File not found:"
-  echo "$UNSIGNED_APK"
-  echo ""
-  echo "An unsigned release version is needed. Please build one with Android Studio."
-  exit 1
-fi
+UNSIGNED_APK_DIR_FILE_LIST=$(ls "$UNSIGNED_APK_DIR"/)
 
 # Get Yubikey PIN
 read -p "Please enter your Yubikey PIV pin: " YUBI_PIN
 
-# Zipalign
-echo "zipaligning the apk"
-echo ""
-$ANDROID_SDK/build-tools/$BUILD_TOOLS_VERSION/zipalign 4 \
-$UNSIGNED_APK $UNSIGNED_APK.tmp && mv -vf $UNSIGNED_APK.tmp $UNSIGNED_APK
-
-echo ""
-echo "signing"
-echo ""
-
-# Signing
-$ANDROID_SDK/build-tools/$BUILD_TOOLS_VERSION/apksigner sign \
---ks NONE \
---ks-pass "pass:$YUBI_PIN" \
---min-sdk-version $MIN_SDK_VERSION \
---max-sdk-version $MAX_SDK_VERSION \
---provider-class sun.security.pkcs11.SunPKCS11 \
---provider-arg $PKCS11_CFG \
---ks-type PKCS11 \
---out $UNSIGNED_APK_DIR/sampleapp-release-signed.apk \
-$UNSIGNED_APK
-
-# Output Verfication
-$ANDROID_SDK/build-tools/$BUILD_TOOLS_VERSION/apksigner verify --verbose \
-$UNSIGNED_APK_DIR/sampleapp-release-signed.apk
+for FILE in $UNSIGNED_APK_DIR_FILE_LIST; do
+  if echo "$FILE" | grep -q ".*release-unsigned.apk"; then
+    # Zipalign
+    echo "zipaligning the apk"
+    echo ""
+    "$ANDROID_SDK"/build-tools/"$BUILD_TOOLS_VERSION"/zipalign 4 \
+    "$UNSIGNED_APK_DIR"/"$FILE" "$FILE".tmp && mv -vf "$FILE".tmp "$FILE"
+
+    echo ""
+    echo "Signing"
+    echo ""
+
+    SIGNED_APK_NAME=$(echo "$FILE" | sed 's+unsigned+signed+g')
+
+    # Signing
+    "$ANDROID_SDK"/build-tools/"$BUILD_TOOLS_VERSION"/apksigner sign \
+    --ks NONE \
+    --ks-pass "pass:$YUBI_PIN" \
+    --min-sdk-version "$MIN_SDK_VERSION" \
+    --max-sdk-version "$MAX_SDK_VERSION" \
+    --provider-class sun.security.pkcs11.SunPKCS11 \
+    --provider-arg "$PKCS11_CFG" \
+    --ks-type PKCS11 \
+    --out "$UNSIGNED_APK_DIR"/"$SIGNED_APK_NAME" \
+    "$UNSIGNED_APK_DIR"/"$FILE"
+
+    # Output Verfication
+    "$ANDROID_SDK"/build-tools/"$BUILD_TOOLS_VERSION"/apksigner verify --verbose \
+    "$UNSIGNED_APK_DIR"/"$SIGNED_APK_NAME"
+  fi
+done
 
 unset YUBI_PIN
 exit 0