Bug 1257326 - Move MOZ_SERVICES_HEALTHREPORT to Python configure. r=glandium

MozReview-Commit-ID: Ku585Pydqxb

browser/confvars.sh

@@ -28,7 +28,6 @@ fi
 MOZ_ENABLE_SIGNMAR=1
 
 MOZ_SAFE_BROWSING=1
-MOZ_SERVICES_HEALTHREPORT=1
 MOZ_SERVICES_SYNC=1
 MOZ_SERVICES_CLOUDSYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION

browser/moz.configure

@@ -5,5 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option('MOZ_PLACES', True)
+imply_option('MOZ_SERVICES_HEALTHREPORT', True)
 
 include('../toolkit/moz.configure')

embedding/ios/confvars.sh

@@ -9,4 +9,3 @@ MOZ_UPDATER=
 MOZ_APP_VERSION=$MOZILLA_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gio"
 MOZ_SERVICES_SYNC=1
-MOZ_SERVICES_HEALTHREPORT=1

embedding/ios/moz.configure

@@ -5,3 +5,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option('MOZ_PLACES', True)
+imply_option('MOZ_SERVICES_HEALTHREPORT', True)

mobile/android/confvars.sh

@@ -46,9 +46,6 @@ if test "$COMPILE_ENVIRONMENT"; then
 MOZ_ENABLE_SZIP=1
 fi
 
-# Enable UI for healthreporter
-MOZ_SERVICES_HEALTHREPORT=1
-
 # Enable second screen using native Android libraries, provided we're
 # not resource constrained.
 if test -z "$MOZ_ANDROID_RESOURCE_CONSTRAINED"; then

mobile/android/moz.configure

@@ -53,6 +53,7 @@ set_config('MOZ_ANDROID_APZ', android_apz)
 set_define('MOZ_ANDROID_APZ', android_apz)
 
 imply_option('MOZ_SOCIAL', False)
+imply_option('MOZ_SERVICES_HEALTHREPORT', True)
 
 @depends(target)
 def check_target(target):

old-configure.in

@@ -6553,12 +6553,6 @@ if test "$BUILD_CTYPES"; then
     AC_DEFINE(BUILD_CTYPES)
 fi
 
-dnl Build Firefox Health Reporter Service
-AC_SUBST(MOZ_SERVICES_HEALTHREPORT)
-if test -n "$MOZ_SERVICES_HEALTHREPORT"; then
-  AC_DEFINE(MOZ_SERVICES_HEALTHREPORT)
-fi
-
 dnl Build Notifications if required
 AC_SUBST(MOZ_SERVICES_NOTIFICATIONS)
 if test -n "$MOZ_SERVICES_NOTIFICATIONS"; then

toolkit/moz.configure

@@ -404,6 +404,11 @@ project_flag('MOZ_SOCIAL',
              help='Build SocialAPI if required',
              default=True)
 
+project_flag('MOZ_SERVICES_HEALTHREPORT',
+             help='Build Firefox Health Reporter Service',
+             set_for_old_configure=True,
+             set_as_define=True)
+
 # Miscellaneous programs
 # ==============================================================