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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

literal 0
HcmV?d00001