Bug 586867 - Define sync services as app tiers, not platform. r=khuey,a=blocking-betaN+
--- 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