Merge pull request #113469 from m4gr3d/deprecate_dev_buildtype

Deprecate the Android studio `dev` buildtype

platform/android/java/editor/build.gradle

@@ -131,14 +131,7 @@ android {
     }
 
     buildTypes {
-        dev {
-            initWith debug
-            applicationIdSuffix ".dev"
-            manifestPlaceholders += [editorBuildSuffix: " (dev)"]
-        }
-
         debug {
-            initWith release
             applicationIdSuffix ".debug"
             manifestPlaceholders += [editorBuildSuffix: " (debug)"]
             signingConfig signingConfigs.debug
@@ -147,6 +140,14 @@ android {
         release {
             if (hasReleaseSigningConfigs()) {
                 signingConfig signingConfigs.release
+            } else {
+                // We default to the debug signingConfigs when the release signing configs are not
+                // available (e.g: development in Android Studio).
+                signingConfig signingConfigs.debug
+                // In addition, we update the application ID to allow installing an Android studio release build
+                // side by side with a production build from the store.
+                applicationIdSuffix ".release"
+                manifestPlaceholders += [editorBuildSuffix: " (release)"]
             }
         }
     }

platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt

@@ -254,7 +254,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 
 		editorMessageDispatcher.parseStartIntent(packageManager, intent)
 
-		if (BuildConfig.BUILD_TYPE == "dev" && WAIT_FOR_DEBUGGER) {
+		if (BuildConfig.BUILD_TYPE == "debug" && WAIT_FOR_DEBUGGER) {
 			Debug.waitForDebugger()
 		}
 
@@ -404,7 +404,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 
 	override fun getCommandLine(): MutableList<String> {
 		val params = super.getCommandLine()
-		if (BuildConfig.BUILD_TYPE == "dev" && !params.contains("--benchmark")) {
+		if (BuildConfig.BUILD_TYPE == "debug" && !params.contains("--benchmark")) {
 			params.add("--benchmark")
 		}
 		return params