25 |
25 |
26 installer: |
26 installer: |
27 @$(MAKE) -C browser/installer installer |
27 @$(MAKE) -C browser/installer installer |
28 |
28 |
29 package: |
29 package: |
30 diff --git a/services/sync/Weave.js b/services/sync/Weave.js |
|
31 --- a/services/sync/Weave.js |
|
32 +++ b/services/sync/Weave.js |
|
33 @@ -76,17 +76,17 @@ WeaveService.prototype = { |
|
34 .getService(Ci.nsIIOService); |
|
35 let resProt = ioService.getProtocolHandler("resource") |
|
36 .QueryInterface(Ci.nsIResProtocolHandler); |
|
37 |
|
38 // Only create alias if resource://services-sync doesn't already exist. |
|
39 if (resProt.hasSubstitution("services-sync")) |
|
40 return; |
|
41 |
|
42 - let uri = ioService.newURI("resource://gre/modules/services-sync/", |
|
43 + let uri = ioService.newURI("resource:///modules/services-sync/", |
|
44 null, null); |
|
45 resProt.setSubstitution("services-sync", uri); |
|
46 } |
|
47 }; |
|
48 |
|
49 function AboutWeaveLog() {} |
|
50 AboutWeaveLog.prototype = { |
|
51 classID: Components.ID("{d28f8a0b-95da-48f4-b712-caf37097be41}"), |
|
52 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 |
53 --- a/toolkit/toolkit-tiers.mk |
31 --- a/toolkit/toolkit-tiers.mk |
54 +++ b/toolkit/toolkit-tiers.mk |
32 +++ b/toolkit/toolkit-tiers.mk |
55 @@ -270,20 +270,15 @@ endif |
33 @@ -281,20 +281,15 @@ endif |
56 ifdef MOZ_LEAKY |
34 ifdef MOZ_LEAKY |
57 tier_platform_dirs += tools/leaky |
35 tier_platform_dirs += tools/leaky |
58 endif |
36 endif |
59 |
37 |
60 ifdef MOZ_MAPINFO |
38 ifdef MOZ_MAPINFO |