wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1248160 - Part 2: Inline MOZ_ANDROID_SHARED_FXACCOUNT_TYPE. r=ted.mielczarek

Browse Source 
This is per-package, so there's no cross-package definition needed.

MozReview-Commit-ID: 8qy2SGJtCh1
This commit is contained in:
Nick Alexander 2016-02-13 10:13:10 -08:00
parent aaff2ddd7e
commit deff89956f
8 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ 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_FXACCOUNT_TYPE = "@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@";
public static final String MOZ_ANDROID_SHARED_FXACCOUNT_TYPE = "@ANDROID_PACKAGE_NAME@_fxaccount";
/**
* Encapsulates access to compile-time version definitions, allowing

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_FXACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE)" \
-DMOZ_BUILDID=$(MOZ_BUILDID) \
$(NULL)

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

@ -60,15 +60,12 @@ strings-xml-preqs =\
$(if $(IS_LANGUAGE_REPACK),FORCE) \
$(NULL)
$(if $(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE),,$(error Missing MOZ_ANDROID_SHARED_FXACCOUNT_TYPE))
$(dir-strings-xml)/strings.xml: $(strings-xml-preqs)
$(call py_action,preprocessor, \
$(DEFINES) \
$(ACDEFINES) \
-DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \
-DBRANDPATH='$(BRANDPATH)' \
-DMOZ_ANDROID_SHARED_FXACCOUNT_TYPE=$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE) \
-DMOZ_APP_DISPLAYNAME='@MOZ_APP_DISPLAYNAME@' \
-DSTRINGSPATH='$(STRINGSPATH)' \
-DSYNCSTRINGSPATH='$(SYNCSTRINGSPATH)' \

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

@ -27,7 +27,7 @@
<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_fxaccount_type">@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@</string>
<string name="moz_android_shared_fxaccount_type">@ANDROID_PACKAGE_NAME@_fxaccount</string>
<string name="android_package_name_for_ui">@ANDROID_PACKAGE_NAME@</string>
#include ../search/strings/search_strings.xml.in

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_FXACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE)" \
$(NULL)
# Targets built very early during a Gradle build.

2
mobile/android/defs.mk
View File

@ -1,6 +1,4 @@
MOZ_ANDROID_SHARED_ID = $(ANDROID_PACKAGE_NAME).sharedID
# 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.

4
mobile/android/services/manifests/FxAccountAndroidManifest_activities.xml.in
View File

@ -20,9 +20,9 @@
<receiver
android:name="org.mozilla.gecko.fxa.receivers.FxAccountDeletedReceiver"
android:permission="@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@.permission.PER_ACCOUNT_TYPE">
android:permission="@ANDROID_PACKAGE_NAME@_fxaccount.permission.PER_ACCOUNT_TYPE">
<intent-filter>
<action android:name="@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@.accounts.ACCOUNT_DELETED_ACTION"/>
<action android:name="@ANDROID_PACKAGE_NAME@_fxaccount.accounts.ACCOUNT_DELETED_ACTION"/>
</intent-filter>
</receiver>

4
mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in
View File

@ -11,8 +11,8 @@
<!-- A signature level permission granted only to the Firefox
channels sharing an Android Account type. -->
<permission
android:name="@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@.permission.PER_ACCOUNT_TYPE"
android:name="@ANDROID_PACKAGE_NAME@_fxaccount.permission.PER_ACCOUNT_TYPE"
android:protectionLevel="signature">
</permission>
<uses-permission android:name="@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@.permission.PER_ACCOUNT_TYPE" />
<uses-permission android:name="@ANDROID_PACKAGE_NAME@_fxaccount.permission.PER_ACCOUNT_TYPE" />