[Scummvm-git-logs] scummvm master -> 734c46587fee4f14cf51b35d73cbbec3cafa6a3a

[lephilousophe]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
734c46587f ANDROID: Set a different package name for debug builds


Commit: 734c46587fee4f14cf51b35d73cbbec3cafa6a3a
    https://github.com/scummvm/scummvm/commit/734c46587fee4f14cf51b35d73cbbec3cafa6a3a
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-01-14T16:53:24+01:00

Commit Message:
ANDROID: Set a different package name for debug builds

This allows to have official release and daily builds side by side

Changed paths:
    dists/android/AndroidManifest.xml
    dists/android/build.gradle
    dists/android/res/values/strings.xml


diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 11e47bf336b..c8080e3dada 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -3,7 +3,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:installLocation="auto"
 	android:launchMode="singleTask"
-	android:sharedUserId="org.scummvm.scummvm"
+	android:sharedUserId="${applicationId}"
 	android:sharedUserMaxSdkVersion="32"
 	tools:targetApi="tiramisu">
 
@@ -39,7 +39,7 @@
 		android:description="@string/app_desc"
 		android:icon="@mipmap/scummvm"
 		android:appCategory="game"
-		android:label="@string/app_name"
+		android:label="@string/app_name${nameSuffix}"
 		android:resizeableActivity="false"
 		android:requestLegacyExternalStorage="true">
 		<activity
diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index d2d53494222..ae15f6fb31a 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -83,9 +83,12 @@ android {
     }
     buildTypes {
         debug{
+            applicationIdSuffix "debug"
+            manifestPlaceholders = [nameSuffix:"_debug"]
             debuggable true
         }
         release {
+            manifestPlaceholders = [nameSuffix:""]
             debuggable false
             // Enables code shrinking, obfuscation, and optimization for only
             // your project's release build type.
diff --git a/dists/android/res/values/strings.xml b/dists/android/res/values/strings.xml
index c4e951c0dee..d54d0e3ce25 100644
--- a/dists/android/res/values/strings.xml
+++ b/dists/android/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_name">ScummVM</string>
+	<string name="app_name_debug">ScummVM (debug)</string>
 	<string name="app_desc">Graphic adventure game engine</string>
 	<string name="ok">OK</string>
 	<string name="quit">Quit</string>