From 303634f7fa96ced65238701ec7a306352eed60a2 Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Fri, 22 Apr 2016 13:01:21 -0700
Subject: [PATCH] Bug 1257958 - Move MOZ_ANDROID_GCM to Python configure.
 r=nalexander

MozReview-Commit-ID: 90vbYKB8rHJ
---
 build/autoconf/android.m4            | 2 --
 mobile/android/bouncer/moz.build     | 4 ++++
 mobile/android/confvars.sh           | 5 -----
 mobile/android/installer/Makefile.in | 4 ++++
 mobile/android/moz.configure         | 5 +++++
 old-configure.in                     | 8 --------
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
index 1e4f56e2a1fb..0fea50ba5214 100644
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -225,8 +225,6 @@ AC_DEFUN([MOZ_ANDROID_GOOGLE_CLOUD_MESSAGING],
 [
 
 if test -n "$MOZ_ANDROID_GCM" ; then
-    AC_SUBST(MOZ_ANDROID_GCM)
-
     MOZ_ANDROID_AAR(play-services-base, 8.1.0, google, com/google/android/gms)
     MOZ_ANDROID_AAR(play-services-basement, 8.1.0, google, com/google/android/gms)
     MOZ_ANDROID_AAR(play-services-gcm, 8.1.0, google, com/google/android/gms)
diff --git a/mobile/android/bouncer/moz.build b/mobile/android/bouncer/moz.build
index 5d67baf6a8f5..264385c64694 100644
--- a/mobile/android/bouncer/moz.build
+++ b/mobile/android/bouncer/moz.build
@@ -12,6 +12,10 @@ for var in ('ANDROID_PACKAGE_NAME',
             'MOZ_APP_VERSION'):
     DEFINES[var] = CONFIG[var]
 
+for var in ('MOZ_ANDROID_GCM',):
+    if CONFIG[var]:
+        DEFINES[var] = CONFIG[var]
+
 ANDROID_APK_NAME = 'bouncer'
 ANDROID_APK_PACKAGE = CONFIG['ANDROID_PACKAGE_NAME']
 
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 3c59b07538c8..7471fa9426ca 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -86,11 +86,6 @@ MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1
 
-# Enable GCM registration on Nightly builds only.
-if test "$NIGHTLY_BUILD"; then
-  MOZ_ANDROID_GCM=1
-fi
-
 # Enable C++ APZ.
 MOZ_ANDROID_APZ=1
 
diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in
index 5eead3cd034d..55d611cff65b 100644
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -41,6 +41,10 @@ ifdef MOZ_ANDROID_EXCLUDE_FONTS
 DEFINES += -DMOZ_ANDROID_EXCLUDE_FONTS=1
 endif
 
+ifdef MOZ_ANDROID_GCM
+DEFINES += -DMOZ_ANDROID_GCM=1
+endif
+
 MOZ_PACKAGER_MINIFY=1
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index 1931cb45fb27..46907d6975e9 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -12,6 +12,11 @@ env_flag('MOZ_LOCALE_SWITCHER',
          help='Enable runtime locale switching',
          default=True)
 
+env_flag('MOZ_ANDROID_GCM',
+         help='Enable GCM registration on Nightly builds only',
+         default=enabled_in_nightly,
+         set_for_old_configure=True)
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':
diff --git a/old-configure.in b/old-configure.in
index 747be1a426af..bf4986e83a10 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -3622,13 +3622,6 @@ if test -n "$MOZ_SWITCHBOARD"; then
     AC_DEFINE(MOZ_SWITCHBOARD)
 fi
 
-dnl ========================================================
-dnl = Enable GCM on Android.
-dnl ========================================================
-if test -n "$MOZ_ANDROID_GCM"; then
-    AC_DEFINE(MOZ_ANDROID_GCM)
-fi
-
 dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
@@ -6834,7 +6827,6 @@ AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_BEAM)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
-AC_SUBST(MOZ_ANDROID_GCM)
 AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)