Issue %3005 - Move toolkit/modules to modules/

- Also builds libmar from modules/

104 files changed, 131 insertions, 140 deletions

diff --git a/components/search/src/nsSearchService.js b/components/search/src/nsSearchService.js
index 7b45e3064..d85146e08 100644
--- a/components/search/src/nsSearchService.js
+++ b/components/search/src/nsSearchService.js
@@ -4521,4 +4521,4 @@ var engineUpdateService = {
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SearchService]);
 
-#include ../../../toolkit/modules/debug.js
+#include ../../../modules/debug.js
diff --git a/toolkit/modules/AppConstants.jsm b/modules/AppConstants.jsm
index 635e936ed..635e936ed 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/modules/AppConstants.jsm
diff --git a/toolkit/modules/AsyncPrefs.jsm b/modules/AsyncPrefs.jsm
index 4ad523fe4..4ad523fe4 100644
--- a/toolkit/modules/AsyncPrefs.jsm
+++ b/modules/AsyncPrefs.jsm
diff --git a/toolkit/modules/Battery.jsm b/modules/Battery.jsm
index 69184d361..69184d361 100644
--- a/toolkit/modules/Battery.jsm
+++ b/modules/Battery.jsm
diff --git a/toolkit/modules/BinarySearch.jsm b/modules/BinarySearch.jsm
index 16bca7398..16bca7398 100644
--- a/toolkit/modules/BinarySearch.jsm
+++ b/modules/BinarySearch.jsm
diff --git a/toolkit/modules/BrowserUtils.jsm b/modules/BrowserUtils.jsm
index 862f9619c..862f9619c 100644
--- a/toolkit/modules/BrowserUtils.jsm
+++ b/modules/BrowserUtils.jsm
diff --git a/toolkit/modules/CanonicalJSON.jsm b/modules/CanonicalJSON.jsm
index ae754ff3a..ae754ff3a 100644
--- a/toolkit/modules/CanonicalJSON.jsm
+++ b/modules/CanonicalJSON.jsm
diff --git a/toolkit/modules/CertUtils.jsm b/modules/CertUtils.jsm
index e61ea9de7..e61ea9de7 100644
--- a/toolkit/modules/CertUtils.jsm
+++ b/modules/CertUtils.jsm
diff --git a/toolkit/modules/CharsetMenu.jsm b/modules/CharsetMenu.jsm
index f6479c024..f6479c024 100644
--- a/toolkit/modules/CharsetMenu.jsm
+++ b/modules/CharsetMenu.jsm
diff --git a/toolkit/modules/ClientID.jsm b/modules/ClientID.jsm
index e29e1ee30..e29e1ee30 100644
--- a/toolkit/modules/ClientID.jsm
+++ b/modules/ClientID.jsm
diff --git a/toolkit/modules/Color.jsm b/modules/Color.jsm
index 00a9bd953..00a9bd953 100644
--- a/toolkit/modules/Color.jsm
+++ b/modules/Color.jsm
diff --git a/toolkit/modules/Console.jsm b/modules/Console.jsm
index 8cf63bcf0..8cf63bcf0 100644
--- a/toolkit/modules/Console.jsm
+++ b/modules/Console.jsm
diff --git a/toolkit/modules/DateTimePickerHelper.jsm b/modules/DateTimePickerHelper.jsm
index b509742b0..b509742b0 100644
--- a/toolkit/modules/DateTimePickerHelper.jsm
+++ b/modules/DateTimePickerHelper.jsm
diff --git a/toolkit/modules/DeferredTask.jsm b/modules/DeferredTask.jsm
index a94fa17f6..a94fa17f6 100644
--- a/toolkit/modules/DeferredTask.jsm
+++ b/modules/DeferredTask.jsm
diff --git a/toolkit/modules/Deprecated.jsm b/modules/Deprecated.jsm
index 981cd13ab..981cd13ab 100644
--- a/toolkit/modules/Deprecated.jsm
+++ b/modules/Deprecated.jsm
diff --git a/toolkit/modules/ExtensionStorage.jsm b/modules/ExtensionStorage.jsm
index 0b0ffb000..0b0ffb000 100644
--- a/toolkit/modules/ExtensionStorage.jsm
+++ b/modules/ExtensionStorage.jsm
diff --git a/toolkit/modules/FileUtils.jsm b/modules/FileUtils.jsm
index df17d60a2..df17d60a2 100644
--- a/toolkit/modules/FileUtils.jsm
+++ b/modules/FileUtils.jsm
diff --git a/toolkit/modules/Finder.jsm b/modules/Finder.jsm
index 0ad0a39c7..0ad0a39c7 100644
--- a/toolkit/modules/Finder.jsm
+++ b/modules/Finder.jsm
diff --git a/toolkit/modules/FinderHighlighter.jsm b/modules/FinderHighlighter.jsm
index e2079fd37..e2079fd37 100644
--- a/toolkit/modules/FinderHighlighter.jsm
+++ b/modules/FinderHighlighter.jsm
diff --git a/toolkit/modules/FinderIterator.jsm b/modules/FinderIterator.jsm
index 15404b012..15404b012 100644
--- a/toolkit/modules/FinderIterator.jsm
+++ b/modules/FinderIterator.jsm
diff --git a/toolkit/modules/ForgetAboutSite.jsm b/modules/ForgetAboutSite.jsm
index 9d7e512a8..9d7e512a8 100644
--- a/toolkit/modules/ForgetAboutSite.jsm
+++ b/modules/ForgetAboutSite.jsm
diff --git a/toolkit/modules/FormLikeFactory.jsm b/modules/FormLikeFactory.jsm
index 45f25187c..45f25187c 100644
--- a/toolkit/modules/FormLikeFactory.jsm
+++ b/modules/FormLikeFactory.jsm
diff --git a/toolkit/modules/Geometry.jsm b/modules/Geometry.jsm
index d2a4dadba..d2a4dadba 100644
--- a/toolkit/modules/Geometry.jsm
+++ b/modules/Geometry.jsm
diff --git a/toolkit/modules/Http.jsm b/modules/Http.jsm
index 3b9daa3b0..3b9daa3b0 100644
--- a/toolkit/modules/Http.jsm
+++ b/modules/Http.jsm
diff --git a/toolkit/modules/InlineSpellChecker.jsm b/modules/InlineSpellChecker.jsm
index de89f73a0..de89f73a0 100644
--- a/toolkit/modules/InlineSpellChecker.jsm
+++ b/modules/InlineSpellChecker.jsm
diff --git a/toolkit/modules/InlineSpellCheckerContent.jsm b/modules/InlineSpellCheckerContent.jsm
index 46046f881..46046f881 100644
--- a/toolkit/modules/InlineSpellCheckerContent.jsm
+++ b/modules/InlineSpellCheckerContent.jsm
diff --git a/toolkit/modules/Integration.jsm b/modules/Integration.jsm
index d648d80ea..d648d80ea 100644
--- a/toolkit/modules/Integration.jsm
+++ b/modules/Integration.jsm
diff --git a/toolkit/modules/JSONFile.jsm b/modules/JSONFile.jsm
index 2926dca78..2926dca78 100644
--- a/toolkit/modules/JSONFile.jsm
+++ b/modules/JSONFile.jsm
diff --git a/toolkit/modules/LoadContextInfo.jsm b/modules/LoadContextInfo.jsm
index 59c5fa620..59c5fa620 100644
--- a/toolkit/modules/LoadContextInfo.jsm
+++ b/modules/LoadContextInfo.jsm
diff --git a/toolkit/modules/Locale.jsm b/modules/Locale.jsm
index 886de9e3a..886de9e3a 100644
--- a/toolkit/modules/Locale.jsm
+++ b/modules/Locale.jsm
diff --git a/toolkit/modules/Log.jsm b/modules/Log.jsm
index 6b741ff9e..6b741ff9e 100644
--- a/toolkit/modules/Log.jsm
+++ b/modules/Log.jsm
diff --git a/toolkit/modules/Memory.jsm b/modules/Memory.jsm
index bb8e331c6..bb8e331c6 100644
--- a/toolkit/modules/Memory.jsm
+++ b/modules/Memory.jsm
diff --git a/toolkit/modules/NLP.jsm b/modules/NLP.jsm
index f596ad9da..f596ad9da 100644
--- a/toolkit/modules/NLP.jsm
+++ b/modules/NLP.jsm
diff --git a/toolkit/modules/NewTabUtils.jsm b/modules/NewTabUtils.jsm
index 500d08fa5..500d08fa5 100644
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/modules/NewTabUtils.jsm
diff --git a/toolkit/modules/ObjectUtils.jsm b/modules/ObjectUtils.jsm
index 8656b3113..8656b3113 100644
--- a/toolkit/modules/ObjectUtils.jsm
+++ b/modules/ObjectUtils.jsm
diff --git a/toolkit/modules/PageMenu.jsm b/modules/PageMenu.jsm
index 30dfbea42..30dfbea42 100644
--- a/toolkit/modules/PageMenu.jsm
+++ b/modules/PageMenu.jsm
diff --git a/toolkit/modules/PageMetadata.jsm b/modules/PageMetadata.jsm
index 820ec38ea..820ec38ea 100644
--- a/toolkit/modules/PageMetadata.jsm
+++ b/modules/PageMetadata.jsm
diff --git a/toolkit/modules/PermissionsUtils.jsm b/modules/PermissionsUtils.jsm
index 4bf43a3ec..4bf43a3ec 100644
--- a/toolkit/modules/PermissionsUtils.jsm
+++ b/modules/PermissionsUtils.jsm
diff --git a/toolkit/modules/PopupNotifications.jsm b/modules/PopupNotifications.jsm
index 7105c1a4f..7105c1a4f 100644
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/modules/PopupNotifications.jsm
diff --git a/toolkit/modules/Preferences.jsm b/modules/Preferences.jsm
index 232d877fb..232d877fb 100644
--- a/toolkit/modules/Preferences.jsm
+++ b/modules/Preferences.jsm
diff --git a/toolkit/modules/PrivateBrowsingUtils.jsm b/modules/PrivateBrowsingUtils.jsm
index 6a84eef93..6a84eef93 100644
--- a/toolkit/modules/PrivateBrowsingUtils.jsm
+++ b/modules/PrivateBrowsingUtils.jsm
diff --git a/toolkit/modules/ProfileAge.jsm b/modules/ProfileAge.jsm
index f6030e2da..f6030e2da 100644
--- a/toolkit/modules/ProfileAge.jsm
+++ b/modules/ProfileAge.jsm
diff --git a/toolkit/modules/Promise-backend.js b/modules/Promise-backend.js
index e585c3f09..e585c3f09 100644
--- a/toolkit/modules/Promise-backend.js
+++ b/modules/Promise-backend.js
diff --git a/toolkit/modules/Promise.jsm b/modules/Promise.jsm
index 56ad83071..56ad83071 100644
--- a/toolkit/modules/Promise.jsm
+++ b/modules/Promise.jsm
diff --git a/toolkit/modules/PromiseMessage.jsm b/modules/PromiseMessage.jsm
index f232d074b..f232d074b 100644
--- a/toolkit/modules/PromiseMessage.jsm
+++ b/modules/PromiseMessage.jsm
diff --git a/toolkit/modules/PromiseUtils.jsm b/modules/PromiseUtils.jsm
index 8ceebced3..8ceebced3 100644
--- a/toolkit/modules/PromiseUtils.jsm
+++ b/modules/PromiseUtils.jsm
diff --git a/toolkit/modules/PropertyListUtils.jsm b/modules/PropertyListUtils.jsm
index 10a9f8f01..10a9f8f01 100644
--- a/toolkit/modules/PropertyListUtils.jsm
+++ b/modules/PropertyListUtils.jsm
diff --git a/toolkit/modules/RemoteController.jsm b/modules/RemoteController.jsm
index 23f1bd949..23f1bd949 100644
--- a/toolkit/modules/RemoteController.jsm
+++ b/modules/RemoteController.jsm
diff --git a/toolkit/modules/RemoteFinder.jsm b/modules/RemoteFinder.jsm
index 8615eee01..8615eee01 100644
--- a/toolkit/modules/RemoteFinder.jsm
+++ b/modules/RemoteFinder.jsm
diff --git a/toolkit/modules/RemotePageManager.jsm b/modules/RemotePageManager.jsm
index a3fea49e6..a3fea49e6 100644
--- a/toolkit/modules/RemotePageManager.jsm
+++ b/modules/RemotePageManager.jsm
diff --git a/toolkit/modules/RemoteSecurityUI.jsm b/modules/RemoteSecurityUI.jsm
index a59176042..a59176042 100644
--- a/toolkit/modules/RemoteSecurityUI.jsm
+++ b/modules/RemoteSecurityUI.jsm
diff --git a/toolkit/modules/RemoteWebProgress.jsm b/modules/RemoteWebProgress.jsm
index 0031d6b98..0031d6b98 100644
--- a/toolkit/modules/RemoteWebProgress.jsm
+++ b/modules/RemoteWebProgress.jsm
diff --git a/toolkit/modules/ResetProfile.jsm b/modules/ResetProfile.jsm
index 2e7891b59..2e7891b59 100644
--- a/toolkit/modules/ResetProfile.jsm
+++ b/modules/ResetProfile.jsm
diff --git a/toolkit/modules/ResponsivenessMonitor.jsm b/modules/ResponsivenessMonitor.jsm
index f84c6d837..f84c6d837 100644
--- a/toolkit/modules/ResponsivenessMonitor.jsm
+++ b/modules/ResponsivenessMonitor.jsm
diff --git a/toolkit/modules/SelectContentHelper.jsm b/modules/SelectContentHelper.jsm
index fd1e41405..fd1e41405 100644
--- a/toolkit/modules/SelectContentHelper.jsm
+++ b/modules/SelectContentHelper.jsm
diff --git a/toolkit/modules/SelectParentHelper.jsm b/modules/SelectParentHelper.jsm
index 2d37cdd5e..2d37cdd5e 100644
--- a/toolkit/modules/SelectParentHelper.jsm
+++ b/modules/SelectParentHelper.jsm
diff --git a/toolkit/modules/ServiceRequest.jsm b/modules/ServiceRequest.jsm
index 92afec113..92afec113 100644
--- a/toolkit/modules/ServiceRequest.jsm
+++ b/modules/ServiceRequest.jsm
diff --git a/toolkit/modules/Services.jsm b/modules/Services.jsm
index 09e5df077..09e5df077 100644
--- a/toolkit/modules/Services.jsm
+++ b/modules/Services.jsm
diff --git a/toolkit/modules/SessionRecorder.jsm b/modules/SessionRecorder.jsm
index 174be08e3..174be08e3 100644
--- a/toolkit/modules/SessionRecorder.jsm
+++ b/modules/SessionRecorder.jsm
diff --git a/toolkit/modules/ShortcutUtils.jsm b/modules/ShortcutUtils.jsm
index fed0950b0..fed0950b0 100644
--- a/toolkit/modules/ShortcutUtils.jsm
+++ b/modules/ShortcutUtils.jsm
diff --git a/toolkit/modules/Sntp.jsm b/modules/Sntp.jsm
index 6041c5f15..6041c5f15 100644
--- a/toolkit/modules/Sntp.jsm
+++ b/modules/Sntp.jsm
diff --git a/toolkit/modules/SpatialNavigation.jsm b/modules/SpatialNavigation.jsm
index c6f18a84f..c6f18a84f 100644
--- a/toolkit/modules/SpatialNavigation.jsm
+++ b/modules/SpatialNavigation.jsm
diff --git a/toolkit/modules/Sqlite.jsm b/modules/Sqlite.jsm
index 6f7a7d94c..6f7a7d94c 100644
--- a/toolkit/modules/Sqlite.jsm
+++ b/modules/Sqlite.jsm
diff --git a/toolkit/modules/Task.jsm b/modules/Task.jsm
index ea0c524a0..ea0c524a0 100644
--- a/toolkit/modules/Task.jsm
+++ b/modules/Task.jsm
diff --git a/toolkit/modules/Timer.jsm b/modules/Timer.jsm
index caef68eac..caef68eac 100644
--- a/toolkit/modules/Timer.jsm
+++ b/modules/Timer.jsm
diff --git a/toolkit/modules/Troubleshoot.jsm b/modules/Troubleshoot.jsm
index d8f485d2c..d8f485d2c 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/modules/Troubleshoot.jsm
diff --git a/toolkit/modules/UpdateUtils.jsm b/modules/UpdateUtils.jsm
index 5e3a2e100..5e3a2e100 100644
--- a/toolkit/modules/UpdateUtils.jsm
+++ b/modules/UpdateUtils.jsm
diff --git a/toolkit/modules/WebChannel.jsm b/modules/WebChannel.jsm
index a32bea0d4..a32bea0d4 100644
--- a/toolkit/modules/WebChannel.jsm
+++ b/modules/WebChannel.jsm
diff --git a/toolkit/modules/WindowDraggingUtils.jsm b/modules/WindowDraggingUtils.jsm
index 5be8814de..5be8814de 100644
--- a/toolkit/modules/WindowDraggingUtils.jsm
+++ b/modules/WindowDraggingUtils.jsm
diff --git a/toolkit/modules/WindowsRegistry.jsm b/modules/WindowsRegistry.jsm
index 518d90d2b..518d90d2b 100644
--- a/toolkit/modules/WindowsRegistry.jsm
+++ b/modules/WindowsRegistry.jsm
diff --git a/toolkit/modules/ZipUtils.jsm b/modules/ZipUtils.jsm
index 13f9173f5..13f9173f5 100644
--- a/toolkit/modules/ZipUtils.jsm
+++ b/modules/ZipUtils.jsm
diff --git a/toolkit/modules/debug.js b/modules/debug.js
index de26ce6ff..de26ce6ff 100644
--- a/toolkit/modules/debug.js
+++ b/modules/debug.js
diff --git a/toolkit/modules/docs/AsyncShutdown.rst b/modules/docs/AsyncShutdown.rst
index 78e3e6c45..78e3e6c45 100644
--- a/toolkit/modules/docs/AsyncShutdown.rst
+++ b/modules/docs/AsyncShutdown.rst
diff --git a/toolkit/modules/docs/index.rst b/modules/docs/index.rst
index 8e476c86a..8e476c86a 100644
--- a/toolkit/modules/docs/index.rst
+++ b/modules/docs/index.rst
diff --git a/modules/moz.build b/modules/moz.build
new file mode 100644
index 000000000..2a1bca274
--- /dev/null
+++ b/modules/moz.build
@@ -0,0 +1,127 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+SPHINX_TREES['toolkit_modules'] = 'docs'
+
+DIRS += ['subprocess']
+
+if CONFIG['MOZ_UPDATER']:
+  # NOTE: The signing related bits of libmar depend on nss
+  DIRS += ['/modules/libmar']
+
+for var in ('MOZ_APP_NAME',
+            'MOZ_APP_VERSION',
+            'MOZ_APP_VERSION_DISPLAY',
+            'MOZ_MACBUNDLE_NAME',
+            'MOZ_WIDGET_TOOLKIT',
+            'MOZ_PKG_SPECIAL',
+            'DLL_PREFIX',
+            'DLL_SUFFIX',
+            'DEBUG_JS_MODULES'):
+  DEFINES[var] = CONFIG[var]
+
+for var in ('MOZ_TOOLKIT_SEARCH', 'MOZ_UPDATER', 'MOZ_SWITCHBOARD'):
+  if CONFIG[var]:
+    DEFINES[var] = True
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+  DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+  DEFINES['HAVE_SHELL_SERVICE'] = 1
+
+DEFINES['TOPOBJDIR'] = TOPOBJDIR
+
+EXTRA_JS_MODULES += [
+  'AsyncPrefs.jsm',
+  'Battery.jsm',
+  'BinarySearch.jsm',
+  'BrowserUtils.jsm',
+  'CanonicalJSON.jsm',
+  'CertUtils.jsm',
+  'CharsetMenu.jsm',
+  'ClientID.jsm',
+  'Color.jsm',
+  'Console.jsm',
+  'DateTimePickerHelper.jsm',
+  'debug.js',
+  'DeferredTask.jsm',
+  'Deprecated.jsm',
+  'ExtensionStorage.jsm',
+  'FileUtils.jsm',
+  'Finder.jsm',
+  'FinderHighlighter.jsm',
+  'FinderIterator.jsm',
+  'ForgetAboutSite.jsm',
+  'FormLikeFactory.jsm',
+  'Geometry.jsm',
+  'Http.jsm',
+  'InlineSpellChecker.jsm',
+  'InlineSpellCheckerContent.jsm',
+  'Integration.jsm',
+  'JSONFile.jsm',
+  'LoadContextInfo.jsm',
+  'Locale.jsm',
+  'Log.jsm',
+  'Memory.jsm',
+  'NewTabUtils.jsm',
+  'NLP.jsm',
+  'ObjectUtils.jsm',
+  'PageMenu.jsm',
+  'PageMetadata.jsm',
+  'PermissionsUtils.jsm',
+  'PopupNotifications.jsm',
+  'Preferences.jsm',
+  'PrivateBrowsingUtils.jsm',
+  'ProfileAge.jsm',
+  'Promise-backend.js',
+  'Promise.jsm',
+  'PromiseMessage.jsm',
+  'PromiseUtils.jsm',
+  'PropertyListUtils.jsm',
+  'RemoteController.jsm',
+  'RemoteFinder.jsm',
+  'RemotePageManager.jsm',
+  'RemoteSecurityUI.jsm',
+  'RemoteWebProgress.jsm',
+  'ResponsivenessMonitor.jsm',
+  'SelectContentHelper.jsm',
+  'SelectParentHelper.jsm',
+  'ServiceRequest.jsm',
+  'SessionRecorder.jsm',
+  'sessionstore/FormData.jsm',
+  'sessionstore/ScrollPosition.jsm',
+  'sessionstore/XPathGenerator.jsm',
+  'ShortcutUtils.jsm',
+  'Sntp.jsm',
+  'SpatialNavigation.jsm',
+  'Sqlite.jsm',
+  'Task.jsm',
+  'Timer.jsm',
+  'WebChannel.jsm',
+  'webrequest/MatchPattern.jsm',
+  'webrequest/WebNavigation.jsm',
+  'webrequest/WebNavigationContent.js',
+  'webrequest/WebNavigationFrames.jsm',
+  'webrequest/WebRequestCommon.jsm',
+  'webrequest/WebRequestContent.js',
+  'webrequest/WebRequestUpload.jsm',
+  'ZipUtils.jsm',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXTRA_JS_MODULES += ['WindowsRegistry.jsm']
+
+EXTRA_PP_JS_MODULES += [
+  'AppConstants.jsm',
+  'ResetProfile.jsm',
+  'Services.jsm',
+  'Troubleshoot.jsm',
+  'UpdateUtils.jsm',
+  'webrequest/WebRequest.jsm',
+  'WindowDraggingUtils.jsm',
+]
+
+EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
diff --git a/toolkit/modules/sessionstore/FormData.jsm b/modules/sessionstore/FormData.jsm
index d4fb08d93..d4fb08d93 100644
--- a/toolkit/modules/sessionstore/FormData.jsm
+++ b/modules/sessionstore/FormData.jsm
diff --git a/toolkit/modules/sessionstore/ScrollPosition.jsm b/modules/sessionstore/ScrollPosition.jsm
index 5267f332a..5267f332a 100644
--- a/toolkit/modules/sessionstore/ScrollPosition.jsm
+++ b/modules/sessionstore/ScrollPosition.jsm
diff --git a/toolkit/modules/sessionstore/Utils.jsm b/modules/sessionstore/Utils.jsm
index 25b75c71b..25b75c71b 100644
--- a/toolkit/modules/sessionstore/Utils.jsm
+++ b/modules/sessionstore/Utils.jsm
diff --git a/toolkit/modules/sessionstore/XPathGenerator.jsm b/modules/sessionstore/XPathGenerator.jsm
index 33f397cdf..33f397cdf 100644
--- a/toolkit/modules/sessionstore/XPathGenerator.jsm
+++ b/modules/sessionstore/XPathGenerator.jsm
diff --git a/toolkit/modules/subprocess/.eslintrc.js b/modules/subprocess/.eslintrc.js
index fd3de6ad2..fd3de6ad2 100644
--- a/toolkit/modules/subprocess/.eslintrc.js
+++ b/modules/subprocess/.eslintrc.js
diff --git a/toolkit/modules/subprocess/Subprocess.jsm b/modules/subprocess/Subprocess.jsm
index 8be8373ff..8be8373ff 100644
--- a/toolkit/modules/subprocess/Subprocess.jsm
+++ b/modules/subprocess/Subprocess.jsm
diff --git a/toolkit/modules/subprocess/docs/index.rst b/modules/subprocess/docs/index.rst
index cb2d439a4..cb2d439a4 100644
--- a/toolkit/modules/subprocess/docs/index.rst
+++ b/modules/subprocess/docs/index.rst
diff --git a/toolkit/modules/subprocess/moz.build b/modules/subprocess/moz.build
index 1051b02e9..1051b02e9 100644
--- a/toolkit/modules/subprocess/moz.build
+++ b/modules/subprocess/moz.build
diff --git a/toolkit/modules/subprocess/subprocess_common.jsm b/modules/subprocess/subprocess_common.jsm
index e1bf4fde2..e1bf4fde2 100644
--- a/toolkit/modules/subprocess/subprocess_common.jsm
+++ b/modules/subprocess/subprocess_common.jsm
diff --git a/toolkit/modules/subprocess/subprocess_shared.js b/modules/subprocess/subprocess_shared.js
index a6a175884..a6a175884 100644
--- a/toolkit/modules/subprocess/subprocess_shared.js
+++ b/modules/subprocess/subprocess_shared.js
diff --git a/toolkit/modules/subprocess/subprocess_shared_unix.js b/modules/subprocess/subprocess_shared_unix.js
index b4864e8f8..b4864e8f8 100644
--- a/toolkit/modules/subprocess/subprocess_shared_unix.js
+++ b/modules/subprocess/subprocess_shared_unix.js
diff --git a/toolkit/modules/subprocess/subprocess_shared_win.js b/modules/subprocess/subprocess_shared_win.js
index 7fb29329c..7fb29329c 100644
--- a/toolkit/modules/subprocess/subprocess_shared_win.js
+++ b/modules/subprocess/subprocess_shared_win.js
diff --git a/toolkit/modules/subprocess/subprocess_unix.jsm b/modules/subprocess/subprocess_unix.jsm
index db05ce24d..db05ce24d 100644
--- a/toolkit/modules/subprocess/subprocess_unix.jsm
+++ b/modules/subprocess/subprocess_unix.jsm
diff --git a/toolkit/modules/subprocess/subprocess_win.jsm b/modules/subprocess/subprocess_win.jsm
index 2b018fd3a..2b018fd3a 100644
--- a/toolkit/modules/subprocess/subprocess_win.jsm
+++ b/modules/subprocess/subprocess_win.jsm
diff --git a/toolkit/modules/subprocess/subprocess_worker_common.js b/modules/subprocess/subprocess_worker_common.js
index 040087108..040087108 100644
--- a/toolkit/modules/subprocess/subprocess_worker_common.js
+++ b/modules/subprocess/subprocess_worker_common.js
diff --git a/toolkit/modules/subprocess/subprocess_worker_unix.js b/modules/subprocess/subprocess_worker_unix.js
index ac6731569..ac6731569 100644
--- a/toolkit/modules/subprocess/subprocess_worker_unix.js
+++ b/modules/subprocess/subprocess_worker_unix.js
diff --git a/toolkit/modules/subprocess/subprocess_worker_win.js b/modules/subprocess/subprocess_worker_win.js
index 74435e852..74435e852 100644
--- a/toolkit/modules/subprocess/subprocess_worker_win.js
+++ b/modules/subprocess/subprocess_worker_win.js
diff --git a/toolkit/modules/webrequest/.eslintrc.js b/modules/webrequest/.eslintrc.js
index 32c92be0a..32c92be0a 100644
--- a/toolkit/modules/webrequest/.eslintrc.js
+++ b/modules/webrequest/.eslintrc.js
diff --git a/toolkit/modules/webrequest/MatchPattern.jsm b/modules/webrequest/MatchPattern.jsm
index 4dff81fd2..4dff81fd2 100644
--- a/toolkit/modules/webrequest/MatchPattern.jsm
+++ b/modules/webrequest/MatchPattern.jsm
diff --git a/toolkit/modules/webrequest/WebNavigation.jsm b/modules/webrequest/WebNavigation.jsm
index 6302a9d79..6302a9d79 100644
--- a/toolkit/modules/webrequest/WebNavigation.jsm
+++ b/modules/webrequest/WebNavigation.jsm
diff --git a/toolkit/modules/webrequest/WebNavigationContent.js b/modules/webrequest/WebNavigationContent.js
index cea4a97b3..cea4a97b3 100644
--- a/toolkit/modules/webrequest/WebNavigationContent.js
+++ b/modules/webrequest/WebNavigationContent.js
diff --git a/toolkit/modules/webrequest/WebNavigationFrames.jsm b/modules/webrequest/WebNavigationFrames.jsm
index 5efa6d104..5efa6d104 100644
--- a/toolkit/modules/webrequest/WebNavigationFrames.jsm
+++ b/modules/webrequest/WebNavigationFrames.jsm
diff --git a/toolkit/modules/webrequest/WebRequest.jsm b/modules/webrequest/WebRequest.jsm
index 26118e43f..26118e43f 100644
--- a/toolkit/modules/webrequest/WebRequest.jsm
+++ b/modules/webrequest/WebRequest.jsm
diff --git a/toolkit/modules/webrequest/WebRequestCommon.jsm b/modules/webrequest/WebRequestCommon.jsm
index 5dc860376..5dc860376 100644
--- a/toolkit/modules/webrequest/WebRequestCommon.jsm
+++ b/modules/webrequest/WebRequestCommon.jsm
diff --git a/toolkit/modules/webrequest/WebRequestContent.js b/modules/webrequest/WebRequestContent.js
index f044a1cd4..f044a1cd4 100644
--- a/toolkit/modules/webrequest/WebRequestContent.js
+++ b/modules/webrequest/WebRequestContent.js
diff --git a/toolkit/modules/webrequest/WebRequestUpload.jsm b/modules/webrequest/WebRequestUpload.jsm
index 789ce683f..789ce683f 100644
--- a/toolkit/modules/webrequest/WebRequestUpload.jsm
+++ b/modules/webrequest/WebRequestUpload.jsm
diff --git a/system/toolkit.mozbuild b/system/toolkit.mozbuild
index e517c8ca5..51d2ad252 100644
--- a/system/toolkit.mozbuild
+++ b/system/toolkit.mozbuild
@@ -3,6 +3,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DIRS += ['/libs']
+
 DIRS += [
     # Depends on NSS and NSPR
     '/security/certverifier',
@@ -10,10 +12,6 @@ DIRS += [
     '/security/apps',
 ]
 
-# the signing related bits of libmar depend on nss
-if CONFIG['MOZ_UPDATER']:
-    DIRS += ['/modules/libmar']
-
 DIRS += [
     '/config/external/freetype2',
     '/xpcom',
@@ -36,8 +34,8 @@ DIRS += [
 ]
 
 DIRS += [
-    '/libs',
     '/components',
+    '/modules',
     '/system'
 ]
 
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
deleted file mode 100644
index 4e4c1d5e3..000000000
--- a/toolkit/modules/moz.build
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-SPHINX_TREES['toolkit_modules'] = 'docs'
-
-EXTRA_JS_MODULES += [
-    'AsyncPrefs.jsm',
-    'Battery.jsm',
-    'BinarySearch.jsm',
-    'BrowserUtils.jsm',
-    'CanonicalJSON.jsm',
-    'CertUtils.jsm',
-    'CharsetMenu.jsm',
-    'ClientID.jsm',
-    'Color.jsm',
-    'Console.jsm',
-    'DateTimePickerHelper.jsm',
-    'debug.js',
-    'DeferredTask.jsm',
-    'Deprecated.jsm',
-    'ExtensionStorage.jsm',
-    'FileUtils.jsm',
-    'Finder.jsm',
-    'FinderHighlighter.jsm',
-    'FinderIterator.jsm',
-    'ForgetAboutSite.jsm',
-    'FormLikeFactory.jsm',
-    'Geometry.jsm',
-    'Http.jsm',
-    'InlineSpellChecker.jsm',
-    'InlineSpellCheckerContent.jsm',
-    'Integration.jsm',
-    'JSONFile.jsm',
-    'LoadContextInfo.jsm',
-    'Locale.jsm',
-    'Log.jsm',
-    'Memory.jsm',
-    'NewTabUtils.jsm',
-    'NLP.jsm',
-    'ObjectUtils.jsm',
-    'PageMenu.jsm',
-    'PageMetadata.jsm',
-    'PermissionsUtils.jsm',
-    'PopupNotifications.jsm',
-    'Preferences.jsm',
-    'PrivateBrowsingUtils.jsm',
-    'ProfileAge.jsm',
-    'Promise-backend.js',
-    'Promise.jsm',
-    'PromiseMessage.jsm',
-    'PromiseUtils.jsm',
-    'PropertyListUtils.jsm',
-    'RemoteController.jsm',
-    'RemoteFinder.jsm',
-    'RemotePageManager.jsm',
-    'RemoteSecurityUI.jsm',
-    'RemoteWebProgress.jsm',
-    'ResponsivenessMonitor.jsm',
-    'SelectContentHelper.jsm',
-    'SelectParentHelper.jsm',
-    'ServiceRequest.jsm',
-    'SessionRecorder.jsm',
-    'sessionstore/FormData.jsm',
-    'sessionstore/ScrollPosition.jsm',
-    'sessionstore/XPathGenerator.jsm',
-    'ShortcutUtils.jsm',
-    'Sntp.jsm',
-    'SpatialNavigation.jsm',
-    'Sqlite.jsm',
-    'Task.jsm',
-    'Timer.jsm',
-    'WebChannel.jsm',
-    'webrequest/MatchPattern.jsm',
-    'webrequest/WebNavigation.jsm',
-    'webrequest/WebNavigationContent.js',
-    'webrequest/WebNavigationFrames.jsm',
-    'webrequest/WebRequestCommon.jsm',
-    'webrequest/WebRequestContent.js',
-    'webrequest/WebRequestUpload.jsm',
-    'ZipUtils.jsm',
-]
-
-EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
-
-EXTRA_PP_JS_MODULES += [
-    'ResetProfile.jsm',
-    'Troubleshoot.jsm',
-    'UpdateUtils.jsm',
-    'webrequest/WebRequest.jsm',
-    'WindowDraggingUtils.jsm',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
-    DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
-    DEFINES['HAVE_SHELL_SERVICE'] = 1
-
-EXTRA_PP_JS_MODULES += [
-    'AppConstants.jsm',
-    'Services.jsm',
-]
-
-DIRS += [
-    'subprocess',
-]
-
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    EXTRA_JS_MODULES += [
-        'WindowsRegistry.jsm',
-    ]
-
-for var in ('MOZ_APP_NAME',
-            'MOZ_APP_VERSION',
-            'MOZ_APP_VERSION_DISPLAY',
-            'MOZ_MACBUNDLE_NAME',
-            'MOZ_WIDGET_TOOLKIT',
-            'MOZ_PKG_SPECIAL',
-            'DLL_PREFIX',
-            'DLL_SUFFIX',
-            'DEBUG_JS_MODULES'):
-            DEFINES[var] = CONFIG[var]
-
-for var in ('MOZ_TOOLKIT_SEARCH',
-            'MOZ_UPDATER',
-            'MOZ_SWITCHBOARD'):
-    if CONFIG[var]:
-        DEFINES[var] = True
-
-DEFINES['TOPOBJDIR'] = TOPOBJDIR
diff --git a/toolkit/moz.build b/toolkit/moz.build
index b464cff11..9ac21d03e 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -6,7 +6,6 @@
 DIRS += [
     'fonts',
     'locales',
-    'modules',
     'themes',
 ]