Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1248160 - Part 1: Remove MOZ_ANDROID_SHARED_ACCOUNT_TYPE. r=ted.mielczarek

Browse Source 
This is cleaning up after Bug 1220906, which removed Old Sync.

MozReview-Commit-ID: EmP4RTMIZ9

--HG--
extra : rebase_source : d97e09ca50dbd2c214c0618d50b7418378697dde
extra : histedit_source : 5148e7d8f5c8f10c36f1fa319ac04fea28432450
This commit is contained in:
Nick Alexander 2016-02-13 10:00:58 -08:00
parent 9c7ded4d2b
commit a369f9a410
8 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/base/AppConstants.java.in
View File

@ -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@";
/**

1
mobile/android/base/Makefile.in
View File

@ -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)

2
mobile/android/base/locales/Makefile.in
View File

@ -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)' \

1
mobile/android/base/strings.xml.in
View File

@ -27,7 +27,6 @@
<string name="content_authority_db_passwords">@ANDROID_PACKAGE_NAME@.db.passwords</string>
<string name="content_authority_db_tabs">@ANDROID_PACKAGE_NAME@.db.tabs</string>
<string name="content_authority_db_readinglist">@ANDROID_PACKAGE_NAME@.db.readinglist</string>
<string name="moz_android_shared_account_type">@MOZ_ANDROID_SHARED_ACCOUNT_TYPE@</string>
<string name="moz_android_shared_fxaccount_type">@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@</string>
<string name="android_package_name_for_ui">@ANDROID_PACKAGE_NAME@</string>

1
mobile/android/bouncer/Makefile.in
View File

@ -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)

7
mobile/android/defs.mk
View File

@ -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

1
mobile/android/tests/background/junit3/Makefile.in
View File

@ -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

1
mobile/android/tests/browser/robocop/Makefile.in
View File

@ -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