Merge pull request #12739 from t895/debug-keystore
android: Provide debug.keystore for debug and relWithDebInfo builds
This commit is contained in:
		@@ -155,3 +155,7 @@ License: MIT
 | 
				
			|||||||
Files: externals/gamemode/*
 | 
					Files: externals/gamemode/*
 | 
				
			||||||
Copyright: Copyright 2017-2019 Feral Interactive
 | 
					Copyright: Copyright 2017-2019 Feral Interactive
 | 
				
			||||||
License: BSD-3-Clause
 | 
					License: BSD-3-Clause
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Files: src/android/app/debug.keystore
 | 
				
			||||||
 | 
					Copyright: 2023 yuzu Emulator Project
 | 
				
			||||||
 | 
					License: GPL-3.0-or-later
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -82,8 +82,8 @@ android {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
 | 
					    val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
 | 
				
			||||||
    if (keystoreFile != null) {
 | 
					    signingConfigs {
 | 
				
			||||||
        signingConfigs {
 | 
					        if (keystoreFile != null) {
 | 
				
			||||||
            create("release") {
 | 
					            create("release") {
 | 
				
			||||||
                storeFile = file(keystoreFile)
 | 
					                storeFile = file(keystoreFile)
 | 
				
			||||||
                storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
 | 
					                storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
 | 
				
			||||||
@@ -91,6 +91,12 @@ android {
 | 
				
			|||||||
                keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
 | 
					                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.
 | 
					    // Define build types, which are orthogonal to product flavors.
 | 
				
			||||||
@@ -101,7 +107,7 @@ android {
 | 
				
			|||||||
            signingConfig = if (keystoreFile != null) {
 | 
					            signingConfig = if (keystoreFile != null) {
 | 
				
			||||||
                signingConfigs.getByName("release")
 | 
					                signingConfigs.getByName("release")
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
                signingConfigs.getByName("debug")
 | 
					                signingConfigs.getByName("default")
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            resValue("string", "app_name_suffixed", "yuzu")
 | 
					            resValue("string", "app_name_suffixed", "yuzu")
 | 
				
			||||||
@@ -118,7 +124,7 @@ android {
 | 
				
			|||||||
        register("relWithDebInfo") {
 | 
					        register("relWithDebInfo") {
 | 
				
			||||||
            isDefault = true
 | 
					            isDefault = true
 | 
				
			||||||
            resValue("string", "app_name_suffixed", "yuzu Debug Release")
 | 
					            resValue("string", "app_name_suffixed", "yuzu Debug Release")
 | 
				
			||||||
            signingConfig = signingConfigs.getByName("debug")
 | 
					            signingConfig = signingConfigs.getByName("default")
 | 
				
			||||||
            isMinifyEnabled = true
 | 
					            isMinifyEnabled = true
 | 
				
			||||||
            isDebuggable = true
 | 
					            isDebuggable = true
 | 
				
			||||||
            proguardFiles(
 | 
					            proguardFiles(
 | 
				
			||||||
@@ -133,6 +139,7 @@ android {
 | 
				
			|||||||
        // Signed by debug key disallowing distribution on Play Store.
 | 
					        // Signed by debug key disallowing distribution on Play Store.
 | 
				
			||||||
        // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
 | 
					        // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
 | 
				
			||||||
        debug {
 | 
					        debug {
 | 
				
			||||||
 | 
					            signingConfig = signingConfigs.getByName("default")
 | 
				
			||||||
            resValue("string", "app_name_suffixed", "yuzu Debug")
 | 
					            resValue("string", "app_name_suffixed", "yuzu Debug")
 | 
				
			||||||
            isDebuggable = true
 | 
					            isDebuggable = true
 | 
				
			||||||
            isJniDebuggable = true
 | 
					            isJniDebuggable = true
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								src/android/app/debug.keystore
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/android/app/debug.keystore
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user