From 59080a3d1d6d9e00a7da876de6453845eab4f15e Mon Sep 17 00:00:00 2001
From: t895 <clombardo169@gmail.com>
Date: Sun, 21 Jan 2024 21:57:24 -0500
Subject: [PATCH] android: Provide debug.keystore for debug and relWithDebInfo
 builds

Allows devs to share debug builds with testers without uninstalling the previous build
---
 .reuse/dep5                      |   4 ++++
 src/android/app/build.gradle.kts |  15 +++++++++++----
 src/android/app/debug.keystore   | Bin 0 -> 2105 bytes
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 src/android/app/debug.keystore

diff --git a/.reuse/dep5 b/.reuse/dep5
index d98b78087..b9ae96d0b 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -155,3 +155,7 @@ License: MIT
 Files: externals/gamemode/*
 Copyright: Copyright 2017-2019 Feral Interactive
 License: BSD-3-Clause
+
+Files: src/android/app/debug.keystore
+Copyright: 2023 yuzu Emulator Project
+License: GPL-3.0-or-later
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index 06e59d1ac..188ef9469 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -82,8 +82,8 @@ android {
     }
 
     val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
-    if (keystoreFile != null) {
-        signingConfigs {
+    signingConfigs {
+        if (keystoreFile != null) {
             create("release") {
                 storeFile = file(keystoreFile)
                 storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
@@ -91,6 +91,12 @@ android {
                 keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
             }
         }
+        create("default") {
+            storeFile = file("$projectDir/debug.keystore")
+            storePassword = "android"
+            keyAlias = "androiddebugkey"
+            keyPassword = "android"
+        }
     }
 
     // Define build types, which are orthogonal to product flavors.
@@ -101,7 +107,7 @@ android {
             signingConfig = if (keystoreFile != null) {
                 signingConfigs.getByName("release")
             } else {
-                signingConfigs.getByName("debug")
+                signingConfigs.getByName("default")
             }
 
             resValue("string", "app_name_suffixed", "yuzu")
@@ -118,7 +124,7 @@ android {
         register("relWithDebInfo") {
             isDefault = true
             resValue("string", "app_name_suffixed", "yuzu Debug Release")
-            signingConfig = signingConfigs.getByName("debug")
+            signingConfig = signingConfigs.getByName("default")
             isMinifyEnabled = true
             isDebuggable = true
             proguardFiles(
@@ -133,6 +139,7 @@ android {
         // Signed by debug key disallowing distribution on Play Store.
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         debug {
+            signingConfig = signingConfigs.getByName("default")
             resValue("string", "app_name_suffixed", "yuzu Debug")
             isDebuggable = true
             isJniDebuggable = true
diff --git a/src/android/app/debug.keystore b/src/android/app/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..e4e194af98f7b0435d8c9c84cea7382ebd606b53
GIT binary patch
literal 2105
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
TzmB}8POC^qz1sEi-G+|<>t3k8

literal 0
HcmV?d00001