Bug 586867 - Define sync services as app tiers, not platform. r=khuey,a=blocking-betaN+
☠☠ backed out by f64feb757627 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 15 Oct 2010 12:27:14 +0200
changeset 55852 111e055a49dc564c523051bf513a7a98ea6d08b1
parent 55851 19cb42fa45543537ed916ab79d326b58e8a8d412
child 55853 01c8100757c444f5209dc47680aa6b11877ac3fd
child 55860 f64feb757627ef4618bb723b4fde991dd3a4098d
push id16310
push usermh@glandium.org
push dateFri, 15 Oct 2010 10:29:42 +0000
treeherdermozilla-central@01c8100757c4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, blocking-betaN
bugs586867
milestone2.0b8pre
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 586867 - Define sync services as app tiers, not platform. r=khuey,a=blocking-betaN+
browser/build.mk
toolkit/toolkit-tiers.mk
--- a/browser/build.mk
+++ b/browser/build.mk
@@ -46,16 +46,21 @@ tier_app_dirs += extensions
 endif
 
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 
 tier_app_dirs += toolkit/components/console/hudservice
 
 tier_app_dirs += browser
 
+ifdef MOZ_SERVICES_SYNC
+tier_app_dirs += services/crypto
+tier_app_dirs += services/sync
+endif
+
 installer:
 	@$(MAKE) -C browser/installer installer
 
 package:
 	@$(MAKE) -C browser/installer
 
 package-compare:
 	@$(MAKE) -C browser/installer package-compare
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -281,20 +281,15 @@ endif
 ifdef MOZ_LEAKY
 tier_platform_dirs        += tools/leaky
 endif
 
 ifdef MOZ_MAPINFO
 tier_platform_dirs	+= tools/codesighs
 endif
 
-ifdef MOZ_SERVICES_SYNC
-tier_platform_dirs += services/crypto
-tier_platform_dirs += services/sync
-endif
-
 ifdef ENABLE_TESTS
 tier_platform_dirs += testing/mochitest
 tier_platform_dirs += testing/xpcshell 
 tier_platform_dirs += testing/mozmill
 tier_platform_dirs += testing/tools/screenshot
 endif