Bug 586867 - Define sync services as app tiers, not platform. r=khuey,a=blocking-betaN+
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 15 Oct 2010 12:27:14 +0200
changeset 55991 36aa9c19420eccfba960a5c7c656ccc26f5c2e62
parent 55990 c00f150e33d8337b2baba26988a7a9a6a2f103f4
child 55992 4056867a34ac368ed9d2ec8f5f9d7d2bde81cf36
push id16362
push usermh@glandium.org
push dateMon, 18 Oct 2010 07:22:42 +0000
treeherdermozilla-central@36aa9c19420e [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
@@ -44,17 +44,24 @@ TIERS += app
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 
 tier_app_dirs += toolkit/components/console/hudservice
 
+ifdef MOZ_SERVICES_SYNC
+tier_app_dirs += services/crypto
+tier_app_dirs += services/sync
+endif
+
 tier_app_dirs += browser
+# Never add other tier_app_dirs after browser. They won't get packaged
+# properly on mac.
 
 installer:
 	@$(MAKE) -C browser/installer installer
 
 package:
 	@$(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