diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in index 5fe577c95648..197a6d850d1e 100644 --- a/mobile/android/base/AppConstants.java.in +++ b/mobile/android/base/AppConstants.java.in @@ -24,7 +24,6 @@ public class AppConstants { public static final String ANDROID_PACKAGE_NAME = "@ANDROID_PACKAGE_NAME@"; public static final String MANGLED_ANDROID_PACKAGE_NAME = "@MANGLED_ANDROID_PACKAGE_NAME@"; - public static final String MOZ_ANDROID_SHARED_ACCOUNT_TYPE = "@MOZ_ANDROID_SHARED_ACCOUNT_TYPE@"; public static final String MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = "@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@"; /** diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 3b5d3a2cf3aa..cf304d7acf3c 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -27,7 +27,6 @@ endif DEFINES += \ -DANDROID_VERSION_CODE=$(ANDROID_VERSION_CODE) \ -DMOZ_ANDROID_SHARED_ID="$(MOZ_ANDROID_SHARED_ID)" \ - -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_ACCOUNT_TYPE)" \ -DMOZ_ANDROID_SHARED_FXACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE)" \ -DMOZ_BUILDID=$(MOZ_BUILDID) \ $(NULL) diff --git a/mobile/android/base/locales/Makefile.in b/mobile/android/base/locales/Makefile.in index a1352e22c6fb..3b5fc03b673b 100644 --- a/mobile/android/base/locales/Makefile.in +++ b/mobile/android/base/locales/Makefile.in @@ -60,7 +60,6 @@ strings-xml-preqs =\ $(if $(IS_LANGUAGE_REPACK),FORCE) \ $(NULL) -$(if $(MOZ_ANDROID_SHARED_ACCOUNT_TYPE),,$(error Missing MOZ_ANDROID_SHARED_ACCOUNT_TYPE)) $(if $(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE),,$(error Missing MOZ_ANDROID_SHARED_FXACCOUNT_TYPE)) $(dir-strings-xml)/strings.xml: $(strings-xml-preqs) @@ -69,7 +68,6 @@ $(dir-strings-xml)/strings.xml: $(strings-xml-preqs) $(ACDEFINES) \ -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \ -DBRANDPATH='$(BRANDPATH)' \ - -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE=$(MOZ_ANDROID_SHARED_ACCOUNT_TYPE) \ -DMOZ_ANDROID_SHARED_FXACCOUNT_TYPE=$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE) \ -DMOZ_APP_DISPLAYNAME='@MOZ_APP_DISPLAYNAME@' \ -DSTRINGSPATH='$(STRINGSPATH)' \ diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index 32272efa6db4..07e7732e0e3a 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -27,7 +27,6 @@ @ANDROID_PACKAGE_NAME@.db.passwords @ANDROID_PACKAGE_NAME@.db.tabs @ANDROID_PACKAGE_NAME@.db.readinglist - @MOZ_ANDROID_SHARED_ACCOUNT_TYPE@ @MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@ @ANDROID_PACKAGE_NAME@ diff --git a/mobile/android/bouncer/Makefile.in b/mobile/android/bouncer/Makefile.in index 058d70c25c5a..fd3915dcbc4c 100644 --- a/mobile/android/bouncer/Makefile.in +++ b/mobile/android/bouncer/Makefile.in @@ -18,7 +18,6 @@ manifest_TARGET := export # Special 'cuz they are set in mobile/android/defs.mk. manifest_FLAGS += \ -DMOZ_ANDROID_SHARED_ID="$(MOZ_ANDROID_SHARED_ID)" \ - -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_ACCOUNT_TYPE)" \ -DMOZ_ANDROID_SHARED_FXACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE)" \ $(NULL) diff --git a/mobile/android/defs.mk b/mobile/android/defs.mk index 6c9e94921bde..f8aa20627cdc 100644 --- a/mobile/android/defs.mk +++ b/mobile/android/defs.mk @@ -1,7 +1,4 @@ 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 @@ -9,14 +6,10 @@ MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = $(ANDROID_PACKAGE_NAME)_fxaccount # 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 diff --git a/mobile/android/tests/background/junit3/Makefile.in b/mobile/android/tests/background/junit3/Makefile.in index 7d35a01f6dc3..6cfd9d9176fe 100644 --- a/mobile/android/tests/background/junit3/Makefile.in +++ b/mobile/android/tests/background/junit3/Makefile.in @@ -13,7 +13,6 @@ manifest_FLAGS += \ -DANDROID_BACKGROUND_TARGET_PACKAGE_NAME='$(ANDROID_PACKAGE_NAME)' \ -DANDROID_BACKGROUND_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME) Background Tests' \ -DMOZ_ANDROID_SHARED_ID='$(ANDROID_PACKAGE_NAME).sharedID' \ - -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE='$(ANDROID_PACKAGE_NAME)_sync' \ $(NULL) ANDROID_MANIFEST_FILE := $(CURDIR)/AndroidManifest.xml diff --git a/mobile/android/tests/browser/robocop/Makefile.in b/mobile/android/tests/browser/robocop/Makefile.in index 5f520768781b..17c5dae28f8e 100644 --- a/mobile/android/tests/browser/robocop/Makefile.in +++ b/mobile/android/tests/browser/robocop/Makefile.in @@ -39,7 +39,6 @@ manifest := $(srcdir)/AndroidManifest.xml.in manifest_TARGET := export manifest_FLAGS += \ -DMOZ_ANDROID_SHARED_ID='$(ANDROID_PACKAGE_NAME).sharedID' \ - -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE='$(ANDROID_PACKAGE_NAME)_sync' \ $(NULL) ANDROID_MANIFEST_FILE := $(CURDIR)/AndroidManifest.xml