diff -r 000000000000 -r 6474c204b198 mobile/android/defs.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/defs.mk	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +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
+# 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
+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
+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
+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
+endif