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

Revert "Yet more gradle fixes"

This reverts commit 7160aaecee.

Revert "More fixes"

This reverts commit ba568b4dec.

Revert "Android: Better use of gradle for suffixes"

This reverts commit f35c93e1ac.

Revert "Undo hotfix"

This reverts commit a243ac0ee0.

Revert "HOTFIX: Fix travis gradle config?"

This reverts commit f2e8ba63e3.

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

This reverts commit 2f681248df, reversing
changes made to e352fb9e9d.

shell/android-studio/android-studio.iml

@@ -0,0 +1,16 @@
+<?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

@@ -21,8 +21,6 @@ android {
 
     defaultConfig {
         applicationId "com.reicast.emulator"
-        resValue "string", "app_name", "Reicast"
-
         minSdkVersion 16
         targetSdkVersion 25
         versionCode getVersionCode()
@@ -46,20 +44,7 @@ android {
         }
     }
 
-
     buildTypes {
-        debug {
-            if (System.getenv("TRAVIS_JOB_ID")) {
-                resValue "string", "app_name", "Reicast CI-" + getVersionName()
-                versionNameSuffix "-CI"
-                applicationIdSuffix ".ci_" + getVersionName().replaceAll('-', '_')
-            } else {
-                resValue "string", "app_name", "Reicast DBG-" + getVersionName()
-                versionNameSuffix "-DBG"
-                applicationIdSuffix ".dbg"
-            }
-        }
-
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'

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

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

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

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