Bug 618195 part 1 - Build libxul part of services-crypto unconditionally. r=mconnor,a=mconnor
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 20 Dec 2010 10:12:10 +0100
changeset 59500 b31d9d9d8527a45af220f618008f0351c0fbff00
parent 59499 fc50c521bf48117b295c3324c0ba07d838c6499d
child 59501 a7dea879b4b445a23186f438900562155bb39e99
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersmconnor, mconnor
bugs618195
milestone2.0b9pre
Bug 618195 part 1 - Build libxul part of services-crypto unconditionally. r=mconnor,a=mconnor
toolkit/library/libxul-config.mk
toolkit/library/nsStaticXULComponents.cpp
toolkit/toolkit-tiers.mk
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -345,19 +345,17 @@ DEFINES += -DMOZ_SPELLCHECK
 COMPONENT_LIBS += spellchecker
 endif
 
 ifdef MOZ_ZIPWRITER
 DEFINES += -DMOZ_ZIPWRITER
 COMPONENT_LIBS += zipwriter
 endif
 
-ifdef MOZ_SERVICES_SYNC
 COMPONENT_LIBS += services-crypto
-endif
 
 ifdef MOZ_DEBUG
 ifdef ENABLE_TESTS
 COMPONENT_LIBS += gkdebug
 endif
 endif
 
 ifdef MOZ_APP_COMPONENT_LIBS
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -228,21 +228,17 @@
 #endif
 
 #if defined(BUILD_CTYPES)
 #define JSCTYPES_MODULE MODULE(jsctypes)
 #else
 #define JSCTYPES_MODULE
 #endif
 
-#ifdef MOZ_SERVICES_SYNC
 #define SERVICES_CRYPTO_MODULE MODULE(nsServicesCryptoModule)
-#else
-#define SERVICES_CRYPTO_MODULE
-#endif
 
 #if defined(MOZ_APP_COMPONENT_INCLUDE)
 #include MOZ_APP_COMPONENT_INCLUDE
 #else
 #define APP_COMPONENT_MODULES
 #endif
 
 #define XUL_MODULES                          \
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -230,19 +230,17 @@ tier_platform_dirs	+= security/manager
 else
 tier_platform_dirs	+= security/manager/boot/public security/manager/ssl/public
 endif
 
 ifdef MOZ_PREF_EXTENSIONS
 tier_platform_dirs += extensions/pref
 endif
 
-ifdef MOZ_SERVICES_SYNC
 tier_platform_dirs += services/crypto
-endif
 
 # JavaXPCOM JNI code is compiled into libXUL
 ifdef MOZ_JAVAXPCOM
 tier_platform_dirs += extensions/java/xpcom/src
 endif
 
 ifndef BUILD_STATIC_LIBS
 ifneq (,$(MOZ_ENABLE_GTK2))