Merge pull request #24866 from OpenRCT2/android-keystore

Use static keystore for signing Android builds

.github/workflows/ci.yml

@@ -613,6 +613,11 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2.18
         with:
           key: android
+      - name: Setup keystore
+        run: |
+          echo "${{ secrets.OPENRCT2_KEYSTORE_CONTENTS }}" | base64 -d > keystore.jks
+          echo "OPENRCT2_KEYSTORE_FILE=${{ github.workspace }}/keystore.jks" >> $GITHUB_ENV
+          echo "OPENRCT2_KEYSTORE_PASSWORD=${{ secrets.OPENRCT2_KEYSTORE_PASSWORD }}" >> $GITHUB_ENV
       - name: Install GCC problem matcher
         uses: ammaraskar/gcc-problem-matcher@master
       - name: Build OpenRCT2

scripts/create-android-keystore

@@ -0,0 +1,48 @@
+#!/bin/bash
+# OpenRCT2 Android Keystore Creation Script
+# This script creates a sample keystore for signing Android APKs
+
+set -e
+
+# Configuration - modify these values as needed
+KEYSTORE_FILE="openrct2-release-key.keystore"
+KEY_ALIAS="openrct2"
+KEY_ALGORITHM="RSA"
+KEY_SIZE="2048"
+VALIDITY_DAYS="10950"  # 30 years
+
+# Certificate details
+CERT_DNAME="CN=OpenRCT2 Team, OU=Development, O=OpenRCT2 Team"
+
+if [ -z "$KEYSTORE_PASSWORD" ]; then
+    echo "Error: KEYSTORE_PASSWORD environment variable must be set"
+    echo "Usage: KEYSTORE_PASSWORD='your_secure_password' $0"
+    exit 1
+fi
+
+echo "Creating OpenRCT2 release keystore..."
+echo "File: $KEYSTORE_FILE"
+echo "Alias: $KEY_ALIAS"
+echo "Algorithm: $KEY_ALGORITHM $KEY_SIZE"
+echo "Validity: $VALIDITY_DAYS days"
+echo "DN: $CERT_DNAME"
+
+# Create the keystore
+keytool -genkeypair \
+    -keystore "$KEYSTORE_FILE" \
+    -alias "$KEY_ALIAS" \
+    -keyalg "$KEY_ALGORITHM" \
+    -keysize "$KEY_SIZE" \
+    -validity "$VALIDITY_DAYS" \
+    -dname "$CERT_DNAME" \
+    -storetype PKCS12 \
+    -storepass "$KEYSTORE_PASSWORD" \
+    -keypass "$KEYSTORE_PASSWORD" \
+    -noprompt
+
+echo "Keystore created successfully: $KEYSTORE_FILE"
+
+# Verify the keystore
+echo ""
+echo "Keystore information:"
+keytool -list -v -keystore "$KEYSTORE_FILE" -storepass "$KEYSTORE_PASSWORD"

src/openrct2-android/app/build.gradle

@@ -4,6 +4,18 @@ android {
     compileSdk 36
     ndkVersion "27.3.13750724" // Latest r27d (LTS), to be synced with CI container image
     namespace "io.openrct2"
+
+    signingConfigs {
+        release {
+            if (System.getenv('OPENRCT2_KEYSTORE_FILE') && System.getenv('OPENRCT2_KEYSTORE_PASSWORD')) {
+                storeFile file(System.getenv('OPENRCT2_KEYSTORE_FILE'))
+                storePassword System.getenv('OPENRCT2_KEYSTORE_PASSWORD')
+                keyAlias "openrct2"
+                keyPassword System.getenv('OPENRCT2_KEYSTORE_PASSWORD')  // Same as keystore password in PKCS12
+            }
+        }
+    }
+
     defaultConfig {
         applicationId 'io.openrct2'
         minSdkVersion 24
@@ -22,7 +34,12 @@ android {
     }
     buildTypes {
         release {
-            signingConfig signingConfigs.debug
+            if (System.getenv('OPENRCT2_KEYSTORE_FILE') && System.getenv('OPENRCT2_KEYSTORE_PASSWORD')) {
+                signingConfig signingConfigs.release
+            } else {
+                // Fallback to ephemeral debug signing when keystore is not available
+                signingConfig signingConfigs.debug
+            }
         }
     }