summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--toolkit/components/formautofill/moz.build3
-rw-r--r--toolkit/content/jar.mn4
-rw-r--r--toolkit/modules/moz.build2
3 files changed, 4 insertions, 5 deletions
diff --git a/toolkit/components/formautofill/moz.build b/toolkit/components/formautofill/moz.build
index 4a358a6c85..61e03c09ab 100644
--- a/toolkit/components/formautofill/moz.build
+++ b/toolkit/components/formautofill/moz.build
@@ -8,12 +8,11 @@ XPIDL_SOURCES += ['nsIFormAutofillContentService.idl']
XPIDL_MODULE = 'toolkit_formautofill'
EXTRA_COMPONENTS += [
+ 'formautofill.manifest',
'FormAutofillContentService.js',
'FormAutofillStartup.js',
]
-EXTRA_PP_COMPONENTS += ['formautofill.manifest']
-
EXTRA_JS_MODULES += [
'content/RequestAutocompleteUI.jsm',
'FormAutofill.jsm',
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 6494645086..1a20f9ee27 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -13,9 +13,9 @@ toolkit.jar:
content/global/aboutAbout.js
content/global/aboutAbout.xhtml
#ifdef MOZ_OFFICIAL_BRANDING
-* content/global/aboutRights.xhtml
+ content/global/aboutRights.xhtml
#else
-* content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
+ content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
#endif
content/global/aboutNetworking.js
content/global/aboutNetworking.xhtml
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 8509eb7cd3..d113b4e5ce 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -10,6 +10,7 @@ EXTRA_JS_MODULES += [
'addons/WebNavigation.jsm',
'addons/WebNavigationContent.js',
'addons/WebNavigationFrames.jsm',
+ 'addons/WebRequest.jsm',
'addons/WebRequestCommon.jsm',
'addons/WebRequestContent.js',
'addons/WebRequestUpload.jsm',
@@ -84,7 +85,6 @@ EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
EXTRA_PP_JS_MODULES += [
- 'addons/WebRequest.jsm',
'ResetProfile.jsm',
'Troubleshoot.jsm',
'UpdateUtils.jsm',