equal
deleted
inserted
replaced
1 # HG changeset patch |
|
2 # Parent 20a161dabb40729976748bf5b13d14f27b76b130 |
|
3 Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk |
|
4 |
|
5 diff --git a/browser/build.mk b/browser/build.mk |
|
6 --- a/browser/build.mk |
|
7 +++ b/browser/build.mk |
|
8 @@ -40,16 +40,21 @@ include $(topsrcdir)/toolkit/toolkit-tie |
|
9 endif |
|
10 |
|
11 TIERS += app |
|
12 |
|
13 ifdef MOZ_EXTENSIONS |
|
14 tier_app_dirs += extensions |
|
15 endif |
|
16 |
|
17 +ifdef MOZ_SERVICES_SYNC |
|
18 +tier_app_dirs += services/crypto |
|
19 +tier_app_dirs += services/sync |
|
20 +endif |
|
21 + |
|
22 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY) |
|
23 |
|
24 tier_app_dirs += toolkit/components/console/hudservice |
|
25 |
|
26 tier_app_dirs += browser |
|
27 |
|
28 installer: |
|
29 @$(MAKE) -C browser/installer installer |
|
30 diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk |
|
31 --- a/toolkit/toolkit-tiers.mk |
|
32 +++ b/toolkit/toolkit-tiers.mk |
|
33 @@ -281,20 +281,15 @@ endif |
|
34 ifdef MOZ_LEAKY |
|
35 tier_platform_dirs += tools/leaky |
|
36 endif |
|
37 |
|
38 ifdef MOZ_MAPINFO |
|
39 tier_platform_dirs += tools/codesighs |
|
40 endif |
|
41 |
|
42 -ifdef MOZ_SERVICES_SYNC |
|
43 -tier_platform_dirs += services/crypto |
|
44 -tier_platform_dirs += services/sync |
|
45 -endif |
|
46 - |
|
47 ifdef ENABLE_TESTS |
|
48 tier_platform_dirs += testing/mochitest |
|
49 tier_platform_dirs += testing/xpcshell |
|
50 tier_platform_dirs += testing/mozmill |
|
51 tier_platform_dirs += testing/tools/screenshot |
|
52 endif |
|
53 |
|