Merge backout; a=orange
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 15 Oct 2010 14:55:09 +0200
changeset 55861 eb674a183386b262da821e55846e85cd7a6d1476
parent 55860 f64feb757627ef4618bb723b4fde991dd3a4098d (diff)
parent 55859 1e685d9c9e704d698b80446d1f48df3313864a69 (current diff)
child 55862 19b35fde8b4dbaeaad343f131952eb904902c8db
child 59307 c25ad89fe707bb1cb00888b7952ee3c869ab2347
push idunknown
push userunknown
push dateunknown
reviewersorange
milestone2.0b8pre
Merge backout; a=orange
xpfe/appshell/src/nsAbout.cpp
xpfe/appshell/src/nsAbout.h
--- a/browser/build.mk
+++ b/browser/build.mk
@@ -46,21 +46,16 @@ 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,15 +281,20 @@ 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