Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch #2); r=joey
authorMike Shal <mshal@mozilla.com>
Mon, 17 Jun 2013 15:22:56 -0400
changeset 148911 5b6dc93537d1a5f6f0cf385268e138ba43592d9e
parent 148910 b7b799dc6cf914e5e0cb15752ade567b9e367fbf
child 148912 f857417260a9e9fe4449131760da3e73ef7b5323
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoey
bugs880245
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch #2); r=joey
toolkit/components/contentprefs/Makefile.in
toolkit/components/contentprefs/moz.build
toolkit/components/ctypes/Makefile.in
toolkit/components/ctypes/moz.build
toolkit/components/jsdownloads/src/Makefile.in
toolkit/components/jsdownloads/src/moz.build
toolkit/components/microformats/Makefile.in
toolkit/components/microformats/moz.build
toolkit/components/perf/Makefile.in
toolkit/components/perf/moz.build
toolkit/components/places/Makefile.in
toolkit/components/places/moz.build
toolkit/components/prompts/src/Makefile.in
toolkit/components/prompts/src/moz.build
toolkit/components/reflect/Makefile.in
toolkit/components/reflect/moz.build
toolkit/components/satchel/Makefile.in
toolkit/components/satchel/moz.build
toolkit/components/social/Makefile.in
toolkit/components/social/moz.build
toolkit/components/telemetry/Makefile.in
toolkit/components/telemetry/moz.build
toolkit/components/thumbnails/Makefile.in
toolkit/components/thumbnails/moz.build
toolkit/components/url-classifier/Makefile.in
toolkit/components/url-classifier/moz.build
toolkit/crashreporter/Makefile.in
toolkit/crashreporter/moz.build
toolkit/crashreporter/test/Makefile.in
toolkit/crashreporter/test/moz.build
toolkit/forgetaboutsite/Makefile.in
toolkit/forgetaboutsite/moz.build
toolkit/identity/Makefile.in
toolkit/identity/moz.build
toolkit/modules/Makefile.in
toolkit/modules/moz.build
toolkit/mozapps/downloads/Makefile.in
toolkit/mozapps/downloads/moz.build
toolkit/mozapps/extensions/Makefile.in
toolkit/mozapps/extensions/moz.build
--- a/toolkit/components/contentprefs/Makefile.in
+++ b/toolkit/components/contentprefs/Makefile.in
@@ -9,15 +9,9 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   nsContentPrefService.js \
   nsContentPrefService.manifest \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  ContentPrefInstance.jsm \
-  ContentPrefService2.jsm \
-  ContentPrefStore.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/contentprefs/moz.build
+++ b/toolkit/components/contentprefs/moz.build
@@ -7,8 +7,15 @@
 TEST_DIRS += ['tests']
 
 MODULE = 'contentprefs'
 
 EXTRA_COMPONENTS += [
     'nsContentPrefService.js',
     'nsContentPrefService.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'ContentPrefInstance.jsm',
+    'ContentPrefService2.jsm',
+    'ContentPrefStore.jsm',
+]
+
--- a/toolkit/components/ctypes/Makefile.in
+++ b/toolkit/components/ctypes/Makefile.in
@@ -6,20 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsctypes
 
-EXTRA_JS_MODULES = \
-    ctypes.jsm \
-    $(NULL)
-
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -9,8 +9,11 @@ TEST_DIRS += ['tests']
 MODULE = 'jsctypes'
 
 CPP_SOURCES += [
     'ctypes.cpp',
 ]
 
 LIBRARY_NAME = 'jsctypes'
 
+EXTRA_JS_MODULES += [
+    'ctypes.jsm',
+]
--- a/toolkit/components/jsdownloads/src/Makefile.in
+++ b/toolkit/components/jsdownloads/src/Makefile.in
@@ -9,21 +9,13 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   Downloads.manifest \
   DownloadLegacy.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  Downloads.jsm \
-  DownloadCore.jsm \
-  DownloadList.jsm \
-  DownloadStore.jsm \
-  DownloadUIHelper.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = \
   DownloadIntegration.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/jsdownloads/src/moz.build
+++ b/toolkit/components/jsdownloads/src/moz.build
@@ -3,8 +3,17 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'DownloadLegacy.js',
     'Downloads.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'DownloadCore.jsm',
+    'DownloadList.jsm',
+    'DownloadStore.jsm',
+    'DownloadUIHelper.jsm',
+    'Downloads.jsm',
+]
+
--- a/toolkit/components/microformats/Makefile.in
+++ b/toolkit/components/microformats/Makefile.in
@@ -4,11 +4,9 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = Microformats.js
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/microformats/moz.build
+++ b/toolkit/components/microformats/moz.build
@@ -3,8 +3,12 @@
 # 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/.
 
 TEST_DIRS += ['tests']
 
 MODULE = 'microformats'
 
+EXTRA_JS_MODULES += [
+    'Microformats.js',
+]
+
--- a/toolkit/components/perf/Makefile.in
+++ b/toolkit/components/perf/Makefile.in
@@ -6,20 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsperf
 
-EXTRA_JS_MODULES = \
-    PerfMeasurement.jsm \
-    $(NULL)
-
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -7,8 +7,11 @@
 MODULE = 'jsperf'
 
 CPP_SOURCES += [
     'PerfMeasurement.cpp',
 ]
 
 LIBRARY_NAME = 'jsperf'
 
+EXTRA_JS_MODULES += [
+    'PerfMeasurement.jsm',
+]
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -27,25 +27,16 @@ DISABLED_EXTRA_COMPONENTS = \
   PlacesCategoriesStarter.js \
   ColorAnalyzer.js \
   $(NULL)
 
 ifdef MOZ_XUL
 DISABLED_EXTRA_COMPONENTS += nsPlacesAutoComplete.js nsPlacesAutoComplete.manifest
 endif
 
-EXTRA_JS_MODULES = \
-  PlacesDBUtils.jsm \
-  ColorAnalyzer_worker.js \
-  ColorConversion.js \
-  ClusterLib.js \
-  BookmarkJSONUtils.jsm \
-  PlacesBackups.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = \
   BookmarkHTMLUtils.jsm \
   PlacesUtils.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -46,16 +46,25 @@ if CONFIG['MOZ_PLACES']:
         'Helpers.cpp',
         'History.cpp',
         'AsyncFaviconHelpers.cpp',
         'PlaceInfo.cpp',
         'VisitInfo.cpp',
         'Database.cpp',
     ]
 
+    EXTRA_JS_MODULES = [
+        'BookmarkJSONUtils.jsm',
+        'ClusterLib.js',
+        'ColorAnalyzer_worker.js',
+        'ColorConversion.js',
+        'PlacesBackups.jsm',
+        'PlacesDBUtils.jsm',
+    ]
+
 MODULE = 'places'
 
 
 if CONFIG['MOZ_PLACES']:
     EXTRA_COMPONENTS += [
         'ColorAnalyzer.js',
         'PlacesCategoriesStarter.js',
         'nsLivemarkService.js',
--- a/toolkit/components/prompts/src/Makefile.in
+++ b/toolkit/components/prompts/src/Makefile.in
@@ -9,13 +9,9 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
     nsPrompter.js \
     nsPrompter.manifest \
     $(NULL)
 
-EXTRA_JS_MODULES = \
-    CommonDialog.jsm \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/prompts/src/moz.build
+++ b/toolkit/components/prompts/src/moz.build
@@ -5,8 +5,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'prompter'
 
 EXTRA_COMPONENTS += [
     'nsPrompter.js',
     'nsPrompter.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'CommonDialog.jsm',
+]
+
--- a/toolkit/components/reflect/Makefile.in
+++ b/toolkit/components/reflect/Makefile.in
@@ -6,20 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsreflect
 
-EXTRA_JS_MODULES = \
-    reflect.jsm \
-    $(NULL)
-
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
 EXTRA_DSO_LDOPTS += \
     $(MOZ_COMPONENT_LIBS) \
     $(MOZ_JS_LIBS) \
     $(NULL)
--- a/toolkit/components/reflect/moz.build
+++ b/toolkit/components/reflect/moz.build
@@ -7,8 +7,11 @@
 MODULE = 'jsreflect'
 
 CPP_SOURCES += [
     'reflect.cpp',
 ]
 
 LIBRARY_NAME = 'jsreflect'
 
+EXTRA_JS_MODULES += [
+    'reflect.jsm',
+]
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -20,17 +20,13 @@ LOCAL_INCLUDES = \
 
 DISABLED_EXTRA_COMPONENTS = \
   nsFormAutoComplete.js \
   FormHistoryStartup.js \
   nsInputListAutoComplete.js \
   satchel.manifest \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  nsFormAutoCompleteResult.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = \
   FormHistory.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -27,8 +27,11 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_PP_COMPONENTS += [
     'nsFormHistory.js',
 ]
 
 LIBRARY_NAME = 'satchel'
 
+EXTRA_JS_MODULES += [
+    'nsFormAutoCompleteResult.jsm',
+]
--- a/toolkit/components/social/Makefile.in
+++ b/toolkit/components/social/Makefile.in
@@ -4,23 +4,9 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_SOCIAL
-# social is turned off for android
-
-EXTRA_JS_MODULES = \
-  FrameWorker.jsm \
-  MessagePortBase.jsm \
-  MessagePortWorker.js \
-  SocialService.jsm \
-  WorkerAPI.jsm \
-  MozSocialAPI.jsm \
-  $(NULL)
-
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/social/moz.build
+++ b/toolkit/components/social/moz.build
@@ -1,7 +1,18 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 TEST_DIRS += ['test']
+
+if CONFIG['MOZ_SOCIAL']:
+    # social is turned off for android
+    EXTRA_JS_MODULES = [
+        'FrameWorker.jsm',
+        'MessagePortBase.jsm',
+        'MessagePortWorker.js',
+        'MozSocialAPI.jsm',
+        'SocialService.jsm',
+        'WorkerAPI.jsm',
+    ]
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -21,21 +21,16 @@ FAIL_ON_WARNINGS = 1
 
 LIBRARY_NAME = telemetry
 MSVC_ENABLE_PGO := 1
 
 DISABLED_EXTRA_COMPONENTS = \
   TelemetryPing.manifest \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  TelemetryStopwatch.jsm \
-  ThirdPartyCookieProbe.jsm \
-  $(NULL)
-
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads
 
 EXTRA_DSO_LDOPTS += \
   $(MOZ_COMPONENT_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
 
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -26,8 +26,12 @@ CPP_SOURCES += [
 EXTRA_COMPONENTS += [
     'TelemetryPing.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'TelemetryPing.js',
 ]
 
+EXTRA_JS_MODULES += [
+    'TelemetryStopwatch.jsm',
+    'ThirdPartyCookieProbe.jsm',
+]
--- a/toolkit/components/thumbnails/Makefile.in
+++ b/toolkit/components/thumbnails/Makefile.in
@@ -9,15 +9,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
 	BrowserPageThumbs.manifest \
 	PageThumbsProtocol.js \
 	$(NULL)
 
-EXTRA_JS_MODULES = \
-	BackgroundPageThumbs.jsm \
-	PageThumbsWorker.js \
-	PageThumbs.jsm \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/thumbnails/moz.build
+++ b/toolkit/components/thumbnails/moz.build
@@ -5,8 +5,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
 EXTRA_COMPONENTS += [
     'BrowserPageThumbs.manifest',
     'PageThumbsProtocol.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'BackgroundPageThumbs.jsm',
+    'PageThumbs.jsm',
+    'PageThumbsWorker.js',
+]
+
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -20,14 +20,9 @@ LOCAL_INCLUDES = \
   $(SQLITE_CFLAGS) \
   $(NULL)
 
 DISABLED_EXTRA_COMPONENTS = \
   nsUrlClassifierHashCompleter.js \
   nsURLClassifier.manifest \
   $(NULL)
 
-# Same as JS components that are run through the pre-processor.
-EXTRA_JS_MODULES = \
-  SafeBrowsing.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -39,8 +39,11 @@ EXTRA_COMPONENTS += [
 # Same as JS components that are run through the pre-processor.
 EXTRA_PP_COMPONENTS += [
     'nsUrlClassifierLib.js',
     'nsUrlClassifierListManager.js',
 ]
 
 LIBRARY_NAME = 'urlclassifier_s'
 
+EXTRA_JS_MODULES += [
+    'SafeBrowsing.jsm',
+]
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -40,19 +40,14 @@ TARGET_LOCAL_INCLUDES = \
   $(NULL)
 endif
 
 LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src
 DEFINES += -DUNICODE -D_UNICODE
 
 FORCE_STATIC_LIB = 1
 
-EXTRA_JS_MODULES = \
-  CrashSubmit.jsm \
-  KeyValueParser.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 check::
 	$(PYTHON) $(srcdir)/tools/unit-symbolstore.py
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -62,13 +62,18 @@ MODULE = 'crashreporter'
 EXPORTS += [
     'nsExceptionHandler.h',
 ]
 
 CPP_SOURCES += [
     'nsExceptionHandler.cpp',
 ]
 
-
 if CONFIG['OS_ARCH'] == 'Darwin':
     CMMSRCS += [
         'mac_utils.mm',
     ]
+
+EXTRA_JS_MODULES += [
+    'CrashSubmit.jsm',
+    'KeyValueParser.jsm',
+]
+
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -22,18 +22,16 @@ VPATH += \
   $(NULL)
 
 LOCAL_INCLUDES += \
   -I$(XPIDL_GEN_DIR) \
   -I$(srcdir)/../google-breakpad/src/ \
   $(NULL)
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
 
-EXTRA_JS_MODULES = CrashTestUtils.jsm
-
 MOCHITEST_BROWSER_FILES = \
   browser/head.js \
   browser/crashreport.sjs \
   browser/browser_aboutCrashes.js \
   browser/browser_bug471404.js \
   browser/browser_aboutCrashesResubmit.js \
   $(NULL)
 
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -14,8 +14,11 @@ CPP_SOURCES += [
     'logging.cc',
     'minidump.cc',
     'nsTestCrasher.cpp',
     'pathname_stripper.cc',
 ]
 
 LIBRARY_NAME = 'testcrasher'
 
+EXTRA_JS_MODULES += [
+    'CrashTestUtils.jsm',
+]
--- a/toolkit/forgetaboutsite/Makefile.in
+++ b/toolkit/forgetaboutsite/Makefile.in
@@ -4,13 +4,9 @@
 
 DEPTH   := @DEPTH@
 topsrcdir := @top_srcdir@
 srcdir    := @srcdir@
 VPATH   := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES := \
-  ForgetAboutSite.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/forgetaboutsite/moz.build
+++ b/toolkit/forgetaboutsite/moz.build
@@ -3,8 +3,12 @@
 # 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/.
 
 TEST_DIRS += ['test']
 
 MODULE = 'forgetaboutsite'
 
+EXTRA_JS_MODULES += [
+    'ForgetAboutSite.jsm',
+]
+
--- a/toolkit/identity/Makefile.in
+++ b/toolkit/identity/Makefile.in
@@ -12,23 +12,9 @@ include $(DEPTH)/config/autoconf.mk
 FAIL_ON_WARNINGS := 1
 
 MODULE_NAME = identity
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 IS_COMPONENT = 1
 EXPORT_LIBRARY = 1
 
-EXTRA_JS_MODULES = \
-	IdentityUtils.jsm \
-	Identity.jsm \
-	IdentityProvider.jsm \
-	IdentityStore.jsm \
-	jwcrypto.jsm \
-	LogUtils.jsm \
-	MinimalIdentity.jsm \
-	RelyingParty.jsm \
-	Sandbox.jsm \
-	$(NULL)
-
-JS_MODULES_PATH = modules/identity
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/identity/moz.build
+++ b/toolkit/identity/moz.build
@@ -13,8 +13,21 @@ XPIDL_SOURCES += [
 MODULE = 'identity'
 
 CPP_SOURCES += [
     'IdentityCryptoService.cpp',
 ]
 
 LIBRARY_NAME = 'identity'
 
+JS_MODULES_PATH = 'modules/identity'
+
+EXTRA_JS_MODULES += [
+    'Identity.jsm',
+    'IdentityProvider.jsm',
+    'IdentityStore.jsm',
+    'IdentityUtils.jsm',
+    'LogUtils.jsm',
+    'MinimalIdentity.jsm',
+    'RelyingParty.jsm',
+    'Sandbox.jsm',
+    'jwcrypto.jsm',
+]
--- a/toolkit/modules/Makefile.in
+++ b/toolkit/modules/Makefile.in
@@ -8,38 +8,16 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
-EXTRA_JS_MODULES := \
-  debug.js \
-  DeferredTask.jsm \
-  Deprecated.jsm \
-  Dict.jsm \
-  FileUtils.jsm \
-  Geometry.jsm \
-  InlineSpellChecker.jsm \
-  NewTabUtils.jsm \
-  PageMenu.jsm \
-  PopupNotifications.jsm \
-  Preferences.jsm \
-  PrivateBrowsingUtils.jsm \
-  Promise.jsm \
-  PropertyListUtils.jsm \
-  RemoteWebProgress.jsm \
-  Sqlite.jsm \
-  Task.jsm \
-  TelemetryTimestamps.jsm \
-  Timer.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = \
   CertUtils.jsm \
   Services.jsm \
   Troubleshoot.jsm \
   UpdateChannel.jsm \
   WindowDraggingUtils.jsm \
   $(NULL)
 
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -1,7 +1,30 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 TEST_DIRS += ['tests']
+
+EXTRA_JS_MODULES += [
+    'DeferredTask.jsm',
+    'Deprecated.jsm',
+    'Dict.jsm',
+    'FileUtils.jsm',
+    'Geometry.jsm',
+    'InlineSpellChecker.jsm',
+    'NewTabUtils.jsm',
+    'PageMenu.jsm',
+    'PopupNotifications.jsm',
+    'Preferences.jsm',
+    'PrivateBrowsingUtils.jsm',
+    'Promise.jsm',
+    'PropertyListUtils.jsm',
+    'RemoteWebProgress.jsm',
+    'Sqlite.jsm',
+    'Task.jsm',
+    'TelemetryTimestamps.jsm',
+    'Timer.jsm',
+    'debug.js',
+]
+
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -7,17 +7,11 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
 DISABLED_EXTRA_COMPONENTS = nsHelperAppDlg.manifest
 
-EXTRA_JS_MODULES = \
-  DownloadLastDir.jsm \
-  DownloadPaths.jsm \
-  DownloadUtils.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = DownloadTaskbarProgress.jsm
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/downloads/moz.build
+++ b/toolkit/mozapps/downloads/moz.build
@@ -10,8 +10,15 @@ MODULE = 'helperAppDlg'
 
 EXTRA_COMPONENTS += [
     'nsHelperAppDlg.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'nsHelperAppDlg.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'DownloadLastDir.jsm',
+    'DownloadPaths.jsm',
+    'DownloadUtils.jsm',
+]
+
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -32,26 +32,15 @@ DISABLED_EXTRA_COMPONENTS = \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
   AddonManager.jsm \
   XPIProvider.jsm \
   XPIProviderUtils.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  AddonLogging.jsm \
-  AddonRepository.jsm \
-  AddonUpdateChecker.jsm \
-  ChromeManifestParser.jsm \
-  LightweightThemeImageOptimizer.jsm \
-  LightweightThemeManager.jsm \
-  PluginProvider.jsm \
-  SpellCheckDictionaryBootstrap.js \
-  $(NULL)
-
 EXTRA_DSO_LDOPTS = \
   $(MOZ_JS_LIBS) \
   $(MOZ_UNICHARUTIL_LIBS) \
   $(MOZ_COMPONENT_LIBS) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -20,8 +20,20 @@ EXTRA_COMPONENTS += [
     'amContentHandler.js',
     'amWebInstallListener.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'extensions.manifest',
     'nsBlocklistService.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'AddonLogging.jsm',
+    'AddonRepository.jsm',
+    'AddonUpdateChecker.jsm',
+    'ChromeManifestParser.jsm',
+    'LightweightThemeImageOptimizer.jsm',
+    'LightweightThemeManager.jsm',
+    'PluginProvider.jsm',
+    'SpellCheckDictionaryBootstrap.js',
+]
+