Bug 1252694 - Set MOZ_ANDROID_GCM_SENDERID directly in branding. r=glandium

Non-Mozilla distributors may wish to run their own autopush endpoint,
using a sender ID and corresponding Google API key that they control.
This simplifies that just a little bit, and gets Mozilla's release
engineering out of the business of managing non-sensitive secrets.

In the future, this sender ID will be baked into the Android APK's
string resources, in accordance with newer Google Play Services
library requirements.

MozReview-Commit-ID: AAxreEP73B0

--HG--
extra : rebase_source : 0a35d18a83558e4d27ac6a47b3833f1d69fed264

mobile/android/branding/aurora/configure.sh

@@ -7,3 +7,4 @@ ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1
 MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
+MOZ_ANDROID_GCM_SENDERID=829133274407

mobile/android/branding/beta/configure.sh

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

mobile/android/branding/nightly/configure.sh

@@ -6,3 +6,4 @@ MOZ_APP_DISPLAYNAME=Nightly
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1
 MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
+MOZ_ANDROID_GCM_SENDERID=829133274407

mobile/android/branding/official/configure.sh

@@ -7,3 +7,4 @@ ANDROID_PACKAGE_NAME=org.mozilla.firefox
 MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=
 MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
+MOZ_ANDROID_GCM_SENDERID=829133274407

mobile/android/branding/unofficial/configure.sh

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

old-configure.in

@@ -3700,7 +3700,6 @@ MOZ_ANDROID_BEAM=
 MOZ_LOCALE_SWITCHER=
 MOZ_ANDROID_SEARCH_ACTIVITY=
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
-MOZ_ANDROID_GCM=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
@@ -3856,14 +3855,6 @@ MOZ_ARG_WITH_STRING(adjust-sdk-keyfile,
   MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN=`cat $withval`)
 AC_SUBST(MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN)
 
-# Allow specifying a GCM sender ID key file that contains the sender ID used for
-# GCM requests.  Note that GCM sender IDs are not sensitive: see, for example,
-# http://stackoverflow.com/a/18216063.
-MOZ_ARG_WITH_STRING(gcm-senderid-keyfile,
-[  --with-gcm-senderid-keyfile=file GCM sender ID for GCM requests],
-  MOZ_ANDROID_GCM_SENDERID=`cat $withval`)
-AC_SUBST(MOZ_ANDROID_GCM_SENDERID)
-
 # Whether this APK is destined for resource constrained devices.
 # We want this in mobile/android/confvars.sh, so it goes early.
 MOZ_ARG_ENABLE_BOOL(android-resource-constrained,
@@ -8576,7 +8567,9 @@ AC_SUBST(MOZ_CHILD_PROCESS_BUNDLE)
 # 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.
+# 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_PROFILE_MIGRATOR: When set, enables profile migrator.
 
 if test -z "$MOZ_APP_NAME"; then
@@ -8634,6 +8627,7 @@ 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(MAR_CHANNEL_ID)
 AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
 AC_SUBST(MOZ_PROFILE_MIGRATOR)