equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 686f29d9e7e6ef165400bec2eea04aa861b83ec5 |
2 # Parent 20a161dabb40729976748bf5b13d14f27b76b130 |
3 Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk |
3 Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk |
4 |
4 |
5 diff --git a/browser/build.mk b/browser/build.mk |
5 diff --git a/browser/build.mk b/browser/build.mk |
6 --- a/browser/build.mk |
6 --- a/browser/build.mk |
7 +++ b/browser/build.mk |
7 +++ b/browser/build.mk |
19 +tier_app_dirs += services/sync |
19 +tier_app_dirs += services/sync |
20 +endif |
20 +endif |
21 + |
21 + |
22 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY) |
22 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY) |
23 |
23 |
|
24 tier_app_dirs += toolkit/components/console/hudservice |
|
25 |
24 tier_app_dirs += browser |
26 tier_app_dirs += browser |
25 |
27 |
26 installer: |
28 installer: |
27 @$(MAKE) -C browser/installer installer |
29 @$(MAKE) -C browser/installer installer |
28 |
|
29 package: |
|
30 diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk |
30 diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk |
31 --- a/toolkit/toolkit-tiers.mk |
31 --- a/toolkit/toolkit-tiers.mk |
32 +++ b/toolkit/toolkit-tiers.mk |
32 +++ b/toolkit/toolkit-tiers.mk |
33 @@ -281,20 +281,15 @@ endif |
33 @@ -281,20 +281,15 @@ endif |
34 ifdef MOZ_LEAKY |
34 ifdef MOZ_LEAKY |