Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | MOZ_ANDROID_SHARED_ID = $(ANDROID_PACKAGE_NAME).sharedID |
michael@0 | 2 | # Android Sync Account types are not per-package: release and beta |
michael@0 | 3 | # share an Account type, and aurora and nightly share an Account type. |
michael@0 | 4 | MOZ_ANDROID_SHARED_ACCOUNT_TYPE = $(ANDROID_PACKAGE_NAME)_sync |
michael@0 | 5 | # Firefox Accounts Account types are per-package. |
michael@0 | 6 | MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = $(ANDROID_PACKAGE_NAME)_fxaccount |
michael@0 | 7 | |
michael@0 | 8 | # We released these builds to the public with shared IDs and need to |
michael@0 | 9 | # keep them consistent. |
michael@0 | 10 | ifeq (org.mozilla.firefox,$(ANDROID_PACKAGE_NAME)) |
michael@0 | 11 | MOZ_ANDROID_SHARED_ID = org.mozilla.firefox.sharedID |
michael@0 | 12 | MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.firefox_sync |
michael@0 | 13 | else ifeq (org.mozilla.firefox_beta,$(ANDROID_PACKAGE_NAME)) |
michael@0 | 14 | MOZ_ANDROID_SHARED_ID = org.mozilla.firefox.sharedID |
michael@0 | 15 | MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.firefox_sync |
michael@0 | 16 | else ifeq (org.mozilla.fennec_aurora,$(ANDROID_PACKAGE_NAME)) |
michael@0 | 17 | MOZ_ANDROID_SHARED_ID = org.mozilla.fennec.sharedID |
michael@0 | 18 | MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.fennec_sync |
michael@0 | 19 | else ifeq (org.mozilla.fennec,$(ANDROID_PACKAGE_NAME)) |
michael@0 | 20 | MOZ_ANDROID_SHARED_ID = org.mozilla.fennec.sharedID |
michael@0 | 21 | MOZ_ANDROID_SHARED_ACCOUNT_TYPE = org.mozilla.fennec_sync |
michael@0 | 22 | endif |