Bug 1391575 - Move MMA GCM sender ID to config file r?maliu,nalexander
MozReview-Commit-ID: Iro4cszQrpF
--- a/mobile/android/base/MmaConstants.java.in
+++ b/mobile/android/base/MmaConstants.java.in
@@ -23,17 +23,22 @@ public class MmaConstants {
public static final String MOZ_LEANPLUM_SDK_CLIENTID =
//#ifdef MOZ_LEANPLUM_SDK_CLIENTID
"@MOZ_LEANPLUM_SDK_CLIENTID@";
//#else
null;
//#endif
-public static final String MOZ_MMA_SENDER_ID = "242693410970";
+public static final String MOZ_MMA_SENDER_ID =
+//#ifdef MOZ_MMA_GCM_SENDERID
+ "@MOZ_MMA_GCM_SENDERID@";
+//#else
+ null;
+//#endif
public static MmaInterface getMma() {
//#ifdef MOZ_ANDROID_MMA
return new MmaLeanplumImp();
//#else
return new MmaStubImp();
//#endif
}
--- a/mobile/android/base/generate_build_config.py
+++ b/mobile/android/base/generate_build_config.py
@@ -55,16 +55,17 @@ def _defines():
'MOZ_DEBUG',
'MOZ_INSTALL_TRACKING',
'MOZ_NATIVE_DEVICES',
'MOZ_SWITCHBOARD'):
if CONFIG[var]:
DEFINES[var] = 1
for var in ('MOZ_ANDROID_GCM_SENDERID',
+ 'MOZ_MMA_GCM_SENDERID',
'MOZ_ANDROID_MAX_SDK_VERSION',
'MOZ_ANDROID_MIN_SDK_VERSION',
'MOZ_PKG_SPECIAL',
'MOZ_UPDATER'):
if CONFIG[var]:
DEFINES[var] = CONFIG[var]
for var in ('ANDROID_CPU_ARCH',
--- a/mobile/android/branding/beta/configure.sh
+++ b/mobile/android/branding/beta/configure.sh
@@ -3,8 +3,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_DISPLAYNAME="Firefox Beta"
ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
MOZ_UPDATER=
MOZ_ANDROID_ANR_REPORTER=
MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
MOZ_ANDROID_GCM_SENDERID=965234145045
+MOZ_MMA_GCM_SENDERID=242693410970
\ No newline at end of file
--- a/mobile/android/branding/nightly-old-id/configure.sh
+++ b/mobile/android/branding/nightly-old-id/configure.sh
@@ -3,8 +3,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_DISPLAYNAME=Nightly
ANDROID_PACKAGE_NAME=org.mozilla.fennec
MOZ_UPDATER=1
MOZ_ANDROID_ANR_REPORTER=1
MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
MOZ_ANDROID_GCM_SENDERID=965234145045
+MOZ_MMA_GCM_SENDERID=242693410970
--- a/mobile/android/branding/official/configure.sh
+++ b/mobile/android/branding/official/configure.sh
@@ -3,8 +3,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_DISPLAYNAME=Firefox
ANDROID_PACKAGE_NAME=org.mozilla.firefox
MOZ_UPDATER=
MOZ_ANDROID_ANR_REPORTER=
MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
MOZ_ANDROID_GCM_SENDERID=965234145045
+MOZ_MMA_GCM_SENDERID=242693410970
\ No newline at end of file
--- a/mobile/android/branding/unofficial/configure.sh
+++ b/mobile/android/branding/unofficial/configure.sh
@@ -2,8 +2,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER | sed 's/-/_/g'`
MOZ_APP_DISPLAYNAME="Fennec `echo $USER | sed 's/-/_/g'`"
MOZ_UPDATER=
MOZ_ANDROID_ANR_REPORTER=
MOZ_ANDROID_GCM_SENDERID=965234145045
+MOZ_MMA_GCM_SENDERID=242693410970
--- a/old-configure.in
+++ b/old-configure.in
@@ -4794,16 +4794,17 @@ AC_SUBST(MOZ_CHILD_PROCESS_BUNDLENAME)
# - MOZ_APP_ANDROID_VERSION_CODE: On Android, "android:versionCode" for
# the main application is set to the value of this variable. If not
# set, it falls back to a Mozilla-specific value derived from the
# build ID.
# - MOZ_ANDROID_SHARED_ID: On Android, "android:sharedUserId" for all Android
# packages produced.
# - MOZ_ANDROID_GCM_SENDERID: On Android, the Android GCM Sender ID used. GCM
# sender IDs are not sensitive: see, http://stackoverflow.com/a/18216063.
+# - MOZ_MMA_GCM_SENDERID: This GCM Sender ID is used for MMA integration.
# - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator.
if test -z "$MOZ_APP_NAME"; then
MOZ_APP_NAME=`echo $MOZ_APP_BASENAME | tr A-Z a-z`
fi
if test -z "$MOZ_APP_REMOTINGNAME"; then
MOZ_APP_REMOTINGNAME=$MOZ_APP_NAME
@@ -4865,16 +4866,17 @@ AC_SUBST(MOZ_APP_REMOTINGNAME)
AC_SUBST(MOZ_APP_DISPLAYNAME)
AC_SUBST(MOZ_APP_BASENAME)
AC_SUBST(MOZ_APP_VENDOR)
AC_SUBST(MOZ_APP_PROFILE)
AC_SUBST(MOZ_APP_ID)
AC_SUBST(MOZ_APP_ANDROID_VERSION_CODE)
AC_SUBST(MOZ_ANDROID_SHARED_ID)
AC_SUBST(MOZ_ANDROID_GCM_SENDERID)
+AC_SUBST(MOZ_MMA_GCM_SENDERID)
AC_SUBST(MAR_CHANNEL_ID)
AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
AC_SUBST(MOZ_PROFILE_MIGRATOR)
AC_DEFINE_UNQUOTED(MOZ_APP_UA_NAME, "$MOZ_APP_UA_NAME")
AC_SUBST(MOZ_APP_UA_NAME)
AC_DEFINE_UNQUOTED(MOZ_APP_UA_VERSION, "$MOZ_APP_VERSION")
AC_SUBST(MOZ_APP_VERSION)
AC_SUBST(MOZ_APP_VERSION_DISPLAY)