Fixes #618 Support debug and release builds on device simultaneously

MozillaReality · Jan 10, 2019 · 6253d06 · 6253d06
1 parent a7a3472
commit 6253d06
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -62,6 +62,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
+            applicationIdSuffix ".dev"
             pseudoLocalesEnabled true
         }
     }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/CrashReporterService.java b/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/CrashReporterService.java
@@ -19,7 +19,7 @@ public class CrashReporterService extends JobIntentService {
 
     private static final String LOGTAG = "VRB";
 
-    public static final String CRASH_ACTION = "org.mozilla.vrbrowser.CRASH_ACTION";
+    public static final String CRASH_ACTION = BuildConfig.APPLICATION_ID + ".CRASH_ACTION";
     public static final String DATA_TAG = "intent";
 
     private static final int PID_CHECK_INTERVAL = 100;

diff --git a/app/src/debug/assets/logo.png b/app/src/debug/assets/logo.png
diff --git a/app/src/debug/res/drawable/ff_logo.png b/app/src/debug/res/drawable/ff_logo.png
diff --git a/app/src/debug/res/drawable/ff_logo_settings.png b/app/src/debug/res/drawable/ff_logo_settings.png
diff --git a/app/src/debug/res/values/non_L10n.xml b/app/src/debug/res/values/non_L10n.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name" translatable="false">Firefox Reality (Dev)</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,11 +6,11 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="org.mozilla.vrbrowser.CRASH_RECEIVER_PERMISSION"/>
+    <uses-permission android:name="${applicationId}.CRASH_RECEIVER_PERMISSION"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-    <permission android:name="org.mozilla.vrbrowser.CRASH_RECEIVER_PERMISSION"
+    <permission android:name="${applicationId}.CRASH_RECEIVER_PERMISSION"
                 android:protectionLevel="signature"/>
 
     <application