Bug 824330 - Build services/ during the platform tier and enable services in xulrunner. r=blassey,r=bsmedberg,r=gps
☠☠ backed out by 0d1a01e16ce7 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 04 Jan 2013 15:56:20 +0100
changeset 126712 6656cdc8b20d739ae2bf88c114620db16fecbe5b
parent 126711 8267325d0772c188ac5e5e8780e0bd8d619b69b8
child 126713 79190c8b1ae5505c046256e9325f86278109b49e
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, bsmedberg, gps
bugs824330
milestone20.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 824330 - Build services/ during the platform tier and enable services in xulrunner. r=blassey,r=bsmedberg,r=gps
b2g/build.mk
browser/build.mk
mobile/android/confvars.sh
mobile/xul/build.mk
services/crypto/Makefile.in
toolkit/toolkit-tiers.mk
xulrunner/confvars.sh
--- a/b2g/build.mk
+++ b/b2g/build.mk
@@ -13,18 +13,16 @@ endif
 endif
 
 TIERS += app
 
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
-tier_app_dirs += services
-
 tier_app_dirs += \
   $(MOZ_BRANDING_DIRECTORY) \
   b2g \
   $(NULL)
 
 
 installer: 
 	@$(MAKE) -C b2g/installer installer
--- a/browser/build.mk
+++ b/browser/build.mk
@@ -9,18 +9,16 @@ endif
 TIERS += app
 
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 
-tier_app_dirs += services
-
 ifdef MOZ_WEBAPP_RUNTIME
 tier_app_dirs += webapprt
 endif
 
 tier_app_dirs += browser
 # Never add other tier_app_dirs after browser. They won't get packaged
 # properly on mac.
 
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -14,19 +14,16 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/a
 
 MOZ_SAFE_BROWSING=1
 
 MOZ_DISABLE_DOMCRYPTO=1
 
 # Enable getUserMedia
 MOZ_MEDIA_NAVIGATOR=1
 
-MOZ_SERVICES_COMMON=1
-MOZ_SERVICES_METRICS=1
-
 if test "$LIBXUL_SDK"; then
 MOZ_XULRUNNER=1
 else
 MOZ_XULRUNNER=
 fi
 
 MOZ_CAPTURE=1
 MOZ_RAW=1
--- a/mobile/xul/build.mk
+++ b/mobile/xul/build.mk
@@ -16,20 +16,16 @@ endif
 endif
 
 TIERS += app
 
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
-ifdef MOZ_SERVICES_SYNC
-tier_app_dirs += services
-endif
-
 tier_app_dirs += \
   $(MOZ_BRANDING_DIRECTORY) \
   mobile/xul \
   $(NULL)
 
 
 installer: 
 	@$(MAKE) -C mobile/xul/installer installer
--- a/services/crypto/Makefile.in
+++ b/services/crypto/Makefile.in
@@ -17,9 +17,11 @@ modules := \
 MODULE = services-crypto
 
 CRYPTO_MODULE_FILES := $(addprefix modules/,$(modules))
 CRYPTO_MODULE_DEST = $(FINAL_TARGET)/modules/services-crypto
 INSTALL_TARGETS += CRYPTO_MODULE
 
 TEST_DIRS += tests
 
+DIRS += component
+
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -255,17 +255,17 @@ tier_platform_dirs += modules/libmar
 endif
 
 tier_platform_dirs	+= toolkit
 
 ifdef MOZ_PREF_EXTENSIONS
 tier_platform_dirs += extensions/pref
 endif
 
-tier_platform_dirs += services/crypto/component
+tier_platform_dirs += services
 
 tier_platform_dirs += startupcache
 
 tier_platform_dirs += js/ductwork/debugger
 
 tier_platform_dirs += other-licenses/snappy
 
 ifdef MOZ_GIO_COMPONENT
--- a/xulrunner/confvars.sh
+++ b/xulrunner/confvars.sh
@@ -7,8 +7,14 @@ MOZ_APP_NAME=xulrunner
 MOZ_APP_DISPLAYNAME=XULRunner
 MOZ_UPDATER=1
 MOZ_XULRUNNER=1
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_APP_VERSION=$MOZILLA_VERSION
 MOZ_PLACES=1
 MOZ_EXTENSIONS_DEFAULT=" gio"
 MOZ_URL_CLASSIFIER=1
+MOZ_SERVICES_AITC=1
+MOZ_SERVICES_COMMON=1
+MOZ_SERVICES_CRYPTO=1
+MOZ_SERVICES_METRICS=1
+MOZ_SERVICES_NOTIFICATIONS=1
+MOZ_SERVICES_SYNC=1