Bug 1257326 - Remove MOZ_SERVICES_CRYPTO. It is usually set, but never checked. draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 09 May 2016 17:06:11 -0700
changeset 365072 31312224b6e18d6843a3b6431f750675d3da025a
parent 365071 a45c91a769fe3b27de888999ee5085ecd47a31c8
child 365073 b4f4f7b36a9845999cbdce198ffb18ee648afab7
push id17624
push usercmanchester@mozilla.com
push dateTue, 10 May 2016 00:06:24 +0000
bugs1257326
milestone49.0a1
Bug 1257326 - Remove MOZ_SERVICES_CRYPTO. It is usually set, but never checked. MozReview-Commit-ID: 1T182VH9sRd
browser/confvars.sh
embedding/ios/confvars.sh
old-configure.in
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -23,17 +23,16 @@ if test "$OS_ARCH" = "WINNT"; then
     fi
   fi
 fi
 
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
 MOZ_SAFE_BROWSING=1
-MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_HEALTHREPORT=1
 MOZ_SERVICES_SYNC=1
 MOZ_SERVICES_CLOUDSYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
 MOZ_EXTENSIONS_DEFAULT=" gio"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
--- a/embedding/ios/confvars.sh
+++ b/embedding/ios/confvars.sh
@@ -3,11 +3,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_APP_NAME=geckoembed
 MOZ_APP_DISPLAYNAME=GeckoEmbed
 MOZ_UPDATER=
 MOZ_APP_VERSION=$MOZILLA_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gio"
-MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_SYNC=1
 MOZ_SERVICES_HEALTHREPORT=1
--- a/old-configure.in
+++ b/old-configure.in
@@ -6613,22 +6613,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 Services crypto component (used by Sync)
-AC_SUBST(MOZ_SERVICES_CRYPTO)
-if test -n "$MOZ_SERVICES_CRYPTO"; then
-  AC_DEFINE(MOZ_SERVICES_CRYPTO)
-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)