From f35c93e1ac549aa9c2ded8c2d7bc18ad9a3cbe34 Mon Sep 17 00:00:00 2001
From: Stefanos Kornilios Mitsis Poiitidis <skmp@nillware.com>
Date: Fri, 3 Aug 2018 03:37:11 +0200
Subject: [PATCH] Android: Better use of gradle for suffixes

---
 shell/android-studio/reicast/build.gradle            | 12 ++++--------
 .../reicast/src/main/res/values/donottranslate.xml   |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/shell/android-studio/reicast/build.gradle b/shell/android-studio/reicast/build.gradle
index 9ff7bfe8b..b160657df 100644
--- a/shell/android-studio/reicast/build.gradle
+++ b/shell/android-studio/reicast/build.gradle
@@ -46,17 +46,13 @@ android {
 
 
     buildTypes {
-        all {
-            resValue "string", "app_name", "Reicast"
-        }
-
         debug {
             if (System.getenv("TRAVIS_JOB_ID")) {
-                resValue "string", "app_name", "Reicast CI-" + getVersionName()
-                android.defaultConfig.applicationId = "com.reicast.emulator.ci_" + getVersionName().replaceAll('-', '_')
+                versionNameSuffix " CI-" + getVersionName()
+                applicationIdSuffix ".ci_" + getVersionName().replaceAll('-', '_')
             } else {
-                resValue "string", "app_name", "Reicast DBG-" + getVersionName()
-                android.defaultConfig.applicationId = "com.reicast.emulator.dbg";
+                versionNameSuffix " DBG-" + getVersionName()
+                applicationIdSuffix ".dbg"
             }
         }
 
diff --git a/shell/android-studio/reicast/src/main/res/values/donottranslate.xml b/shell/android-studio/reicast/src/main/res/values/donottranslate.xml
index 434bd8856..b79233a85 100644
--- a/shell/android-studio/reicast/src/main/res/values/donottranslate.xml
+++ b/shell/android-studio/reicast/src/main/res/values/donottranslate.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <!-- name is now in gradle -->
+    <string name="app_name">Reicast</string>
 
     <string name="app_site">http://reicast.com</string>