Bug 1391575 - Move MMA GCM sender ID to config file r=maliu,nalexander

MozReview-Commit-ID: Iro4cszQrpF

--HG--
extra : rebase_source : 640614062d699413afdf15c29606a3bfff2d461b

mobile/android/base/MmaConstants.java.in

@@ -28,7 +28,12 @@ public static final String MOZ_LEANPLUM_SDK_CLIENTID =
     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

mobile/android/base/generate_build_config.py

@@ -60,6 +60,7 @@ def _defines():
             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',

mobile/android/branding/beta/configure.sh

@@ -8,3 +8,4 @@ MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=
 MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
 MOZ_ANDROID_GCM_SENDERID=965234145045
+MOZ_MMA_GCM_SENDERID=242693410970

mobile/android/branding/nightly-old-id/configure.sh

@@ -8,3 +8,4 @@ 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

mobile/android/branding/official/configure.sh

@@ -8,3 +8,4 @@ MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=
 MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
 MOZ_ANDROID_GCM_SENDERID=965234145045
+MOZ_MMA_GCM_SENDERID=242693410970

mobile/android/branding/unofficial/configure.sh

@@ -7,3 +7,4 @@ 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

old-configure.in

@@ -4675,6 +4675,7 @@ AC_SUBST(MOZ_CHILD_PROCESS_BUNDLENAME)
 # 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
@@ -4742,6 +4743,7 @@ 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)