Bug 1257326 - Remove MOZ_SERVICES_NOTIFICATIONS. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Thu, 12 May 2016 11:55:59 -0700
changeset 336241 282619c208b6d93a86d4b48a95edf557175739a9
parent 336240 5b74c0699042acc8355f4542344bff2c5dd8e1c1
child 336242 5d4213512f1af0c13fb721db996b6f440bb3e789
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1257326
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1257326 - Remove MOZ_SERVICES_NOTIFICATIONS. r=glandium It is never set by default, and only triggers installation of a prefs file that no longer exists if it is set. MozReview-Commit-ID: 8OQXRCmpsIT
browser/installer/package-manifest.in
old-configure.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -677,19 +677,16 @@
 @RESPATH@/browser/defaults/permissions
 
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 
 ; Services (gre) prefs
-#ifdef MOZ_SERVICES_NOTIFICATIONS
-@RESPATH@/defaults/pref/services-notifications.js
-#endif
 @RESPATH@/defaults/pref/services-sync.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
 @RESPATH@/res/EditorOverride.css
 @RESPATH@/res/contenteditable.css
 @RESPATH@/res/designmode.css
 @RESPATH@/res/ImageDocument.css
--- a/old-configure.in
+++ b/old-configure.in
@@ -6548,22 +6548,16 @@ MOZ_ARG_DISABLE_BOOL(ctypes,
 [  --disable-ctypes        Disable js-ctypes],
     BUILD_CTYPES=,
     BUILD_CTYPES=1)
 AC_SUBST(BUILD_CTYPES)
 if test "$BUILD_CTYPES"; then
     AC_DEFINE(BUILD_CTYPES)
 fi
 
-dnl Build Notifications if required
-AC_SUBST(MOZ_SERVICES_NOTIFICATIONS)
-if test -n "$MOZ_SERVICES_NOTIFICATIONS"; then
-  AC_DEFINE(MOZ_SERVICES_NOTIFICATIONS)
-fi
-
 dnl Build Sync Services if required
 AC_SUBST(MOZ_SERVICES_SYNC)
 if test -n "$MOZ_SERVICES_SYNC"; then
   AC_DEFINE(MOZ_SERVICES_SYNC)
 fi
 
 dnl Build Services/CloudSync if required
 AC_SUBST(MOZ_SERVICES_CLOUDSYNC)