Bug 988437 - Part 2: Make Firefox Account Android Account type unique per package. r=rnewman, a=sylvestre
authorNick Alexander <nalexander@mozilla.com>
Wed, 09 Apr 2014 09:20:15 -0700
changeset 183686 47c8852fde22
parent 183685 5dfea367b8b9
child 183687 b39c5ca49785
push id3446
push usernalexander@mozilla.com
push date2014-04-09 16:21 +0000
treeherdermozilla-beta@47c8852fde22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman, sylvestre
bugs988437
milestone29.0
Bug 988437 - Part 2: Make Firefox Account Android Account type unique per package. r=rnewman, a=sylvestre

This bumps every package's account type so that any issues shake out on
Nightly (which otherwise would not have experienced an account type
change).

The trivial change to the AndroidManifest is to ensure that the new
Account type is picked up by the build system, in the hopes of avoiding
a clobber.
mobile/android/base/AndroidManifest.xml.in
mobile/android/defs.mk
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -242,18 +242,18 @@
           <intent-filter>
             <action android:name="org.mozilla.gecko.restart"/>
             <action android:name="org.mozilla.gecko.restart_update"/>
           </intent-filter>
         </activity>
 
 #include ../services/manifests/AnnouncementsAndroidManifest_activities.xml.in
 #include ../services/manifests/FxAccountAndroidManifest_activities.xml.in
+#include ../services/manifests/HealthReportAndroidManifest_activities.xml.in
 #include ../services/manifests/SyncAndroidManifest_activities.xml.in
-#include ../services/manifests/HealthReportAndroidManifest_activities.xml.in
 
 #if MOZ_CRASHREPORTER
   <activity android:name="org.mozilla.gecko.CrashReporter"
             android:label="@string/crash_reporter_title"
             android:icon="@drawable/crash_reporter"
             android:theme="@style/Gecko"
             android:exported="false"
             android:excludeFromRecents="true">
--- a/mobile/android/defs.mk
+++ b/mobile/android/defs.mk
@@ -1,23 +1,22 @@
 MOZ_ANDROID_SHARED_ID = $(ANDROID_PACKAGE_NAME).sharedID
+# Android Sync Account types are not per-package: release and beta
+# share an Account type, and aurora and nightly share an Account type.
 MOZ_ANDROID_SHARED_ACCOUNT_TYPE = $(ANDROID_PACKAGE_NAME)_sync
-MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = $(ANDROID_PACKAGE_NAME)_account
+# Firefox Accounts Account types are per-package.
+MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = $(ANDROID_PACKAGE_NAME)_fxaccount
 
 # We released these builds to the public with shared IDs and need to
 # keep them consistent.
 ifeq (org.mozilla.firefox,$(ANDROID_PACKAGE_NAME))
 MOZ_ANDROID_SHARED_ID = org.mozilla.firefox.sharedID
 MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.firefox_sync
-MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = org.mozilla.firefox_account
 else ifeq (org.mozilla.firefox_beta,$(ANDROID_PACKAGE_NAME))
 MOZ_ANDROID_SHARED_ID = org.mozilla.firefox.sharedID
 MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.firefox_sync
-MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = org.mozilla.firefox_account
 else ifeq (org.mozilla.fennec_aurora,$(ANDROID_PACKAGE_NAME))
 MOZ_ANDROID_SHARED_ID = org.mozilla.fennec.sharedID
 MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.fennec_sync
-MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = org.mozilla.fennec_account
 else ifeq (org.mozilla.fennec,$(ANDROID_PACKAGE_NAME))
 MOZ_ANDROID_SHARED_ID = org.mozilla.fennec.sharedID
 MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.fennec_sync
-MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = org.mozilla.fennec_account
 endif