diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2024-01-22 10:34:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 10:34:17 +0100 |
| commit | 889c5d2705f8b39e27d0adf75c6831902d74943d (patch) | |
| tree | 9d5bc53e21cfe82a817645d2780747717d27ed1f | |
| parent | Merge pull request #12738 from t895/lock-drawer (diff) | |
| parent | android: Provide debug.keystore for debug and relWithDebInfo builds (diff) | |
| download | yuzu-889c5d2705f8b39e27d0adf75c6831902d74943d.tar yuzu-889c5d2705f8b39e27d0adf75c6831902d74943d.tar.gz yuzu-889c5d2705f8b39e27d0adf75c6831902d74943d.tar.bz2 yuzu-889c5d2705f8b39e27d0adf75c6831902d74943d.tar.lz yuzu-889c5d2705f8b39e27d0adf75c6831902d74943d.tar.xz yuzu-889c5d2705f8b39e27d0adf75c6831902d74943d.tar.zst yuzu-889c5d2705f8b39e27d0adf75c6831902d74943d.zip | |
| -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 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 Binary files differnew file mode 100644 index 000000000..e4e194af9 --- /dev/null +++ b/src/android/app/debug.keystore |