Bug 618195 part 1 - Build libxul part of services-crypto unconditionally. r=mconnor,a=mconnor

toolkit/library/libxul-config.mk

@@ -350,9 +350,7 @@ DEFINES += -DMOZ_ZIPWRITER
 COMPONENT_LIBS += zipwriter
 endif
 
-ifdef MOZ_SERVICES_SYNC
 COMPONENT_LIBS += services-crypto
-endif
 
 ifdef MOZ_DEBUG
 ifdef ENABLE_TESTS

toolkit/library/nsStaticXULComponents.cpp

@@ -233,11 +233,7 @@
 #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

toolkit/toolkit-tiers.mk

@@ -235,9 +235,7 @@ 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