diff options
Diffstat (limited to '')
| -rw-r--r-- | .reuse/dep5 | 4 | ||||
| -rw-r--r-- | src/android/app/build.gradle.kts | 15 | ||||
| -rw-r--r-- | src/android/app/debug.keystore | bin | 0 -> 2105 bytes |
3 files changed, 15 insertions, 4 deletions
diff --git a/.reuse/dep5 b/.reuse/dep5 index d98b78087..b9ae96d0b 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 | |||
| @@ -155,3 +155,7 @@ License: MIT | |||
| 155 | Files: externals/gamemode/* | 155 | Files: externals/gamemode/* |
| 156 | Copyright: Copyright 2017-2019 Feral Interactive | 156 | Copyright: Copyright 2017-2019 Feral Interactive |
| 157 | License: BSD-3-Clause | 157 | License: BSD-3-Clause |
| 158 | |||
| 159 | Files: src/android/app/debug.keystore | ||
| 160 | Copyright: 2023 yuzu Emulator Project | ||
| 161 | 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 { | |||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE") | 84 | val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE") |
| 85 | if (keystoreFile != null) { | 85 | signingConfigs { |
| 86 | signingConfigs { | 86 | if (keystoreFile != null) { |
| 87 | create("release") { | 87 | create("release") { |
| 88 | storeFile = file(keystoreFile) | 88 | storeFile = file(keystoreFile) |
| 89 | storePassword = System.getenv("ANDROID_KEYSTORE_PASS") | 89 | storePassword = System.getenv("ANDROID_KEYSTORE_PASS") |
| @@ -91,6 +91,12 @@ android { | |||
| 91 | keyPassword = System.getenv("ANDROID_KEYSTORE_PASS") | 91 | keyPassword = System.getenv("ANDROID_KEYSTORE_PASS") |
| 92 | } | 92 | } |
| 93 | } | 93 | } |
| 94 | create("default") { | ||
| 95 | storeFile = file("$projectDir/debug.keystore") | ||
| 96 | storePassword = "android" | ||
| 97 | keyAlias = "androiddebugkey" | ||
| 98 | keyPassword = "android" | ||
| 99 | } | ||
| 94 | } | 100 | } |
| 95 | 101 | ||
| 96 | // Define build types, which are orthogonal to product flavors. | 102 | // Define build types, which are orthogonal to product flavors. |
| @@ -101,7 +107,7 @@ android { | |||
| 101 | signingConfig = if (keystoreFile != null) { | 107 | signingConfig = if (keystoreFile != null) { |
| 102 | signingConfigs.getByName("release") | 108 | signingConfigs.getByName("release") |
| 103 | } else { | 109 | } else { |
| 104 | signingConfigs.getByName("debug") | 110 | signingConfigs.getByName("default") |
| 105 | } | 111 | } |
| 106 | 112 | ||
| 107 | resValue("string", "app_name_suffixed", "yuzu") | 113 | resValue("string", "app_name_suffixed", "yuzu") |
| @@ -118,7 +124,7 @@ android { | |||
| 118 | register("relWithDebInfo") { | 124 | register("relWithDebInfo") { |
| 119 | isDefault = true | 125 | isDefault = true |
| 120 | resValue("string", "app_name_suffixed", "yuzu Debug Release") | 126 | resValue("string", "app_name_suffixed", "yuzu Debug Release") |
| 121 | signingConfig = signingConfigs.getByName("debug") | 127 | signingConfig = signingConfigs.getByName("default") |
| 122 | isMinifyEnabled = true | 128 | isMinifyEnabled = true |
| 123 | isDebuggable = true | 129 | isDebuggable = true |
| 124 | proguardFiles( | 130 | proguardFiles( |
| @@ -133,6 +139,7 @@ android { | |||
| 133 | // Signed by debug key disallowing distribution on Play Store. | 139 | // Signed by debug key disallowing distribution on Play Store. |
| 134 | // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build. | 140 | // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build. |
| 135 | debug { | 141 | debug { |
| 142 | signingConfig = signingConfigs.getByName("default") | ||
| 136 | resValue("string", "app_name_suffixed", "yuzu Debug") | 143 | resValue("string", "app_name_suffixed", "yuzu Debug") |
| 137 | isDebuggable = true | 144 | isDebuggable = true |
| 138 | isJniDebuggable = true | 145 | isJniDebuggable = true |
diff --git a/src/android/app/debug.keystore b/src/android/app/debug.keystore new file mode 100644 index 000000000..e4e194af9 --- /dev/null +++ b/src/android/app/debug.keystore | |||
| Binary files differ | |||