Merge pull request #1251 from reicast/skmp/dev-names

Android: Use unique name,package* bw icons for CI/DBG builds

shell/android-studio/android-studio.iml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

shell/android-studio/reicast/build.gradle

@@ -44,7 +44,22 @@ 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('-', '_')
+            } else {
+                resValue "string", "app_name", "Reicast DBG-" + getVersionName()
+                android.defaultConfig.applicationId = "com.reicast.emulator.dbg";
+            }
+        }
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'

shell/android-studio/reicast/src/main/assets/build

@@ -1 +0,0 @@
-9891979f2c0e9e9e8a8975e16aea9b4e943bd3aa

shell/android-studio/reicast/src/main/res/values/donottranslate.xml

@@ -1,6 +1,6 @@
 <resources>
 
-    <string name="app_name">reicast</string>
+    <!-- name is now in gradle -->
 
     <string name="app_site">http://reicast.com</string>
 
@@ -65,4 +65,4 @@
         <item>K</item>
     </string-array>
 
-</resources>
+</resources>