bug 870370: move EXTRA_COMPONENTS to moz.build (file batch #2). r=mshal

2024-09-13 09:24:08 -07:00 · 2013-06-10 11:19:28 -04:00 · 2013-06-10 11:19:28 -04:00 · d47bba4871
commit d47bba4871
parent 9c311782b0
64 changed files with 217 additions and 36 deletions
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@ -16,7 +16,7 @@ FAIL_ON_WARNINGS := 1

 include $(topsrcdir)/dom/dom-config.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  ActivityOptions.js \
  ActivityProxy.js \
  ActivityRequestHandler.js \
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@ -14,3 +14,10 @@ CPP_SOURCES += [
    'Activity.cpp',
 ]

+EXTRA_COMPONENTS += [
+    'Activities.manifest',
+    'ActivityOptions.js',
+    'ActivityProxy.js',
+    'ActivityRequestHandler.js',
+    'ActivityWrapper.js',
+]
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@ -16,7 +16,7 @@ FAIL_ON_WARNINGS := 1

 include $(topsrcdir)/dom/dom-config.mk

-EXTRA_COMPONENTS =       \
+DISABLED_EXTRA_COMPONENTS =       \
  AlarmsManager.js       \
  AlarmsManager.manifest \
  $(NULL)
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@ -27,3 +27,7 @@ CPP_SOURCES += [
    'AlarmHalService.cpp',
 ]

+EXTRA_COMPONENTS += [
+    'AlarmsManager.js',
+    'AlarmsManager.manifest',
+]
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@ -9,7 +9,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  AppsService.js \
  AppsService.manifest \
  Webapps.manifest \
--- a/dom/apps/src/moz.build
+++ b/dom/apps/src/moz.build
@ -4,3 +4,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/.

+EXTRA_COMPONENTS += [
+    'AppsService.js',
+    'AppsService.manifest',
+    'Webapps.manifest',
+]
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@ -15,7 +15,7 @@ LIBXUL_LIBRARY	= 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  SiteSpecificUserAgent.js \
  SiteSpecificUserAgent.manifest \
  ConsoleAPI.js \
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@ -97,3 +97,9 @@ CPP_SOURCES += [
    'nsWindowRoot.cpp',
 ]

+EXTRA_COMPONENTS += [
+    'ConsoleAPI.js',
+    'ConsoleAPI.manifest',
+    'SiteSpecificUserAgent.js',
+    'SiteSpecificUserAgent.manifest',
+]
--- a/dom/contacts/Makefile.in
+++ b/dom/contacts/Makefile.in
@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk

 VPATH += $(srcdir)/fallback

-EXTRA_COMPONENTS =        \
+DISABLED_EXTRA_COMPONENTS =        \
  ContactManager.js       \
  ContactManager.manifest \
  $(NULL)
--- a/dom/contacts/moz.build
+++ b/dom/contacts/moz.build
@ -5,3 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'ContactManager.js',
+    'ContactManager.manifest',
+]
--- a/dom/identity/Makefile.in
+++ b/dom/identity/Makefile.in
@ -11,7 +11,7 @@ relativesrcdir   = @relativesrcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
    nsDOMIdentity.js \
    nsIDService.js \
    Identity.manifest \
--- a/dom/identity/moz.build
+++ b/dom/identity/moz.build
@ -5,3 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'Identity.manifest',
+    'nsDOMIdentity.js',
+    'nsIDService.js',
+]
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@ -17,7 +17,7 @@ FAIL_ON_WARNINGS := 1

 include $(topsrcdir)/dom/dom-config.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  PeerConnection.js \
  PeerConnection.manifest \
  $(NULL)
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@ -27,3 +27,7 @@ CPP_SOURCES += [
    'MediaManager.cpp',
 ]

+EXTRA_COMPONENTS += [
+    'PeerConnection.js',
+    'PeerConnection.manifest',
+]
--- a/dom/messages/Makefile.in
+++ b/dom/messages/Makefile.in
@ -11,7 +11,7 @@ relativesrcdir   = @relativesrcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  SystemMessageManager.js \
  SystemMessageInternal.js \
  SystemMessageManager.manifest \
--- a/dom/messages/moz.build
+++ b/dom/messages/moz.build
@ -5,3 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 PARALLEL_DIRS += ['interfaces']
+
+EXTRA_COMPONENTS += [
+    'SystemMessageInternal.js',
+    'SystemMessageManager.js',
+    'SystemMessageManager.manifest',
+]
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@ -14,14 +14,14 @@ LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
 	TCPSocket.js \
 	TCPSocketParentIntermediary.js \
 	TCPSocket.manifest \
 	$(NULL)

 ifdef MOZ_B2G_RIL
-EXTRA_COMPONENTS += \
+DISABLED_EXTRA_COMPONENTS += \
  NetworkStatsManager.manifest \
  NetworkStatsManager.js \
  $(NULL)
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@ -23,3 +23,15 @@ if CONFIG['MOZ_B2G_RIL']:
    CPP_SOURCES += [
        'MobileConnection.cpp',
    ]
+
+EXTRA_COMPONENTS += [
+    'TCPSocket.js',
+    'TCPSocket.manifest',
+    'TCPSocketParentIntermediary.js',
+]
+
+if CONFIG['MOZ_B2G_RIL']:
+    EXTRA_COMPONENTS += [
+        'NetworkStatsManager.js',
+        'NetworkStatsManager.manifest',
+    ]
--- a/dom/permission/Makefile.in
+++ b/dom/permission/Makefile.in
@ -9,7 +9,7 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS =        \
+DISABLED_EXTRA_COMPONENTS =        \
  PermissionSettings.js       \
  PermissionSettings.manifest \
  PermissionPromptService.js \
--- a/dom/permission/moz.build
+++ b/dom/permission/moz.build
@ -5,3 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'PermissionPromptService.js',
+    'PermissionPromptService.manifest',
+    'PermissionSettings.js',
+    'PermissionSettings.manifest',
+]
--- a/dom/push/src/Makefile.in
+++ b/dom/push/src/Makefile.in
@ -9,7 +9,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  Push.js \
  Push.manifest \
  $(NULL)
--- a/dom/push/src/moz.build
+++ b/dom/push/src/moz.build
@ -1,5 +1,10 @@
+# -*- 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/.

+EXTRA_COMPONENTS += [
+    'Push.js',
+    'Push.manifest',
+]
--- a/dom/settings/Makefile.in
+++ b/dom/settings/Makefile.in
@ -9,7 +9,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS =         \
+DISABLED_EXTRA_COMPONENTS =         \
  SettingsManager.js       \
  SettingsManager.manifest \
  SettingsService.js \
--- a/dom/settings/moz.build
+++ b/dom/settings/moz.build
@ -5,3 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'SettingsManager.js',
+    'SettingsManager.manifest',
+    'SettingsService.js',
+    'SettingsService.manifest',
+]
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@ -9,7 +9,7 @@ VPATH     = @srcdir@

 include $(topsrcdir)/config/config.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  nsDefaultCLH.manifest \
  nsDefaultCLH.js \
  $(NULL)
--- a/toolkit/components/console/Makefile.in
+++ b/toolkit/components/console/Makefile.in
@ -10,7 +10,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  jsconsole-clhandler.js \
  jsconsole-clhandler.manifest \
  $(NULL)
--- a/toolkit/components/console/moz.build
+++ b/toolkit/components/console/moz.build
@ -5,3 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'jsconsole-clhandler.js',
+    'jsconsole-clhandler.manifest',
+]
--- a/toolkit/components/contentprefs/Makefile.in
+++ b/toolkit/components/contentprefs/Makefile.in
@ -9,7 +9,7 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  nsContentPrefService.js \
  nsContentPrefService.manifest \
  $(NULL)
--- a/toolkit/components/contentprefs/moz.build
+++ b/toolkit/components/contentprefs/moz.build
@ -8,3 +8,7 @@ TEST_DIRS += ['tests']

 MODULE = 'contentprefs'

+EXTRA_COMPONENTS += [
+    'nsContentPrefService.js',
+    'nsContentPrefService.manifest',
+]
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@ -20,7 +20,7 @@ include $(topsrcdir)/config/config.mk
 ifndef MOZ_SUITE
 # XXX - Until Suite builds off XULRunner we can't guarantee our implementation
 # of nsIDownloadManagerUI overrides toolkit's.
-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  nsDownloadManagerUI.js \
  nsDownloadManagerUI.manifest \
  $(NULL)
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@ -24,3 +24,11 @@ if CONFIG['OS_ARCH'] == 'WINNT':
    CPP_SOURCES += [
        'nsDownloadScanner.cpp',
    ]
+
+# XXX - Until Suite builds off XULRunner we can't guarantee our implementation
+# of nsIDownloadManagerUI overrides toolkit's.
+if not CONFIG['MOZ_SUITE']:
+    EXTRA_COMPONENTS += [
+        'nsDownloadManagerUI.js',
+        'nsDownloadManagerUI.manifest',
+    ]
--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@ -15,7 +15,7 @@ MOZILLA_INTERNAL_API = 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1

-EXTRA_COMPONENTS = FeedProcessor.js FeedProcessor.manifest
+DISABLED_EXTRA_COMPONENTS = FeedProcessor.js FeedProcessor.manifest

 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/feeds/moz.build
+++ b/toolkit/components/feeds/moz.build
@ -21,3 +21,7 @@ XPIDL_SOURCES += [

 MODULE = 'feeds'

+EXTRA_COMPONENTS += [
+    'FeedProcessor.js',
+    'FeedProcessor.manifest',
+]
--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@ -18,7 +18,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsFileViewModule
 LIBXUL_LIBRARY = 1
-EXTRA_COMPONENTS = nsFilePicker.js
+DISABLED_EXTRA_COMPONENTS = nsFilePicker.js
 EXTRA_PP_COMPONENTS = nsFilePicker.manifest
 endif
 endif
--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@ -13,4 +13,6 @@ if CONFIG['MOZ_XUL'] and \
        CPP_SOURCES += [
            'nsFileView.cpp',
        ]
-
+        EXTRA_COMPONENTS += [
+            'nsFilePicker.js',
+        ]
--- a/toolkit/components/jsdownloads/src/Makefile.in
+++ b/toolkit/components/jsdownloads/src/Makefile.in
@ -9,7 +9,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  Downloads.manifest \
  DownloadLegacy.js \
  $(NULL)
--- a/toolkit/components/jsdownloads/src/moz.build
+++ b/toolkit/components/jsdownloads/src/moz.build
@ -4,3 +4,7 @@
 # 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',
+]
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@ -72,3 +72,8 @@ if CONFIG['MOZ_CAPTIVEDETECT']:
    PARALLEL_DIRS += ['captivedetect']

 DIRS += ['build']
+
+EXTRA_COMPONENTS += [
+    'nsDefaultCLH.js',
+    'nsDefaultCLH.manifest',
+]
--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@ -9,7 +9,7 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  crypto-SDR.js \
  nsLoginInfo.js \
  nsLoginManager.js \
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@ -18,3 +18,11 @@ XPIDL_SOURCES += [

 MODULE = 'loginmgr'

+EXTRA_COMPONENTS += [
+    'crypto-SDR.js',
+    'nsLoginInfo.js',
+    'nsLoginManager.js',
+    'nsLoginManagerPrompter.js',
+    'passwordmgr.manifest',
+    'storage-Legacy.js',
+]
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@ -19,7 +19,7 @@ IS_COMPONENT = 1

 LOCAL_INCLUDES += -I$(srcdir)/../build

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  toolkitplaces.manifest \
  nsLivemarkService.js \
  nsTaggingService.js \
@ -29,7 +29,7 @@ EXTRA_COMPONENTS = \
  $(NULL)

 ifdef MOZ_XUL
-EXTRA_COMPONENTS += nsPlacesAutoComplete.js nsPlacesAutoComplete.manifest
+DISABLED_EXTRA_COMPONENTS += nsPlacesAutoComplete.js nsPlacesAutoComplete.manifest
 endif

 EXTRA_JS_MODULES = \
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@ -53,3 +53,18 @@ if CONFIG['MOZ_PLACES']:

 MODULE = 'places'

+
+if CONFIG['MOZ_PLACES']:
+    EXTRA_COMPONENTS += [
+        'ColorAnalyzer.js',
+        'PlacesCategoriesStarter.js',
+        'nsLivemarkService.js',
+        'nsPlacesExpiration.js',
+        'nsTaggingService.js',
+        'toolkitplaces.manifest',
+    ]
+    if CONFIG['MOZ_XUL']:
+        EXTRA_COMPONENTS += [
+            'nsPlacesAutoComplete.js',
+            'nsPlacesAutoComplete.manifest',
+        ]
--- a/toolkit/components/prompts/src/Makefile.in
+++ b/toolkit/components/prompts/src/Makefile.in
@ -9,7 +9,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
    nsPrompter.js \
    nsPrompter.manifest \
    $(NULL)
--- a/toolkit/components/prompts/src/moz.build
+++ b/toolkit/components/prompts/src/moz.build
@ -6,3 +6,7 @@

 MODULE = 'prompter'

+EXTRA_COMPONENTS += [
+    'nsPrompter.js',
+    'nsPrompter.manifest',
+]
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@ -19,7 +19,7 @@ LOCAL_INCLUDES = \
  -I$(srcdir)/../build \
  $(NULL)

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  nsFormAutoComplete.js \
  FormHistoryStartup.js \
  nsInputListAutoComplete.js \
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@ -19,3 +19,9 @@ CPP_SOURCES += [
    'nsFormFillController.cpp',
 ]

+EXTRA_COMPONENTS += [
+    'FormHistoryStartup.js',
+    'nsFormAutoComplete.js',
+    'nsInputListAutoComplete.js',
+    'satchel.manifest',
+]
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@ -9,7 +9,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  toolkitsearch.manifest \
  nsSearchSuggestions.js \
  $(NULL)
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@ -5,3 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'nsSearchSuggestions.js',
+    'toolkitsearch.manifest',
+]
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@ -26,7 +26,7 @@ EXTRA_PP_COMPONENTS = \
  TelemetryPing.js \
  $(NULL)

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  TelemetryPing.manifest \
  $(NULL)

--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@ -23,3 +23,6 @@ CPP_SOURCES += [
    'Telemetry.cpp',
 ]

+EXTRA_COMPONENTS += [
+    'TelemetryPing.manifest',
+]
--- a/toolkit/components/thumbnails/Makefile.in
+++ b/toolkit/components/thumbnails/Makefile.in
@ -9,7 +9,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
 	BrowserPageThumbs.manifest \
 	PageThumbsProtocol.js \
 	$(NULL)
--- a/toolkit/components/thumbnails/moz.build
+++ b/toolkit/components/thumbnails/moz.build
@ -5,3 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['test']
+
+EXTRA_COMPONENTS += [
+    'BrowserPageThumbs.manifest',
+    'PageThumbsProtocol.js',
+]
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@ -21,7 +21,7 @@ LOCAL_INCLUDES = \
  $(SQLITE_CFLAGS) \
  $(NULL)

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  nsUrlClassifierHashCompleter.js \
  nsURLClassifier.manifest \
  $(NULL)
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@ -31,3 +31,7 @@ CPP_SOURCES += [
    'nsUrlClassifierUtils.cpp',
 ]

+EXTRA_COMPONENTS += [
+    'nsURLClassifier.manifest',
+    'nsUrlClassifierHashCompleter.js',
+]
--- a/toolkit/components/urlformatter/Makefile.in
+++ b/toolkit/components/urlformatter/Makefile.in
@ -10,7 +10,7 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  nsURLFormatter.manifest \
  nsURLFormatter.js \
  $(NULL)
--- a/toolkit/components/urlformatter/moz.build
+++ b/toolkit/components/urlformatter/moz.build
@ -12,3 +12,7 @@ XPIDL_SOURCES += [

 MODULE = 'urlformatter'

+EXTRA_COMPONENTS += [
+    'nsURLFormatter.js',
+    'nsURLFormatter.manifest',
+]
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@ -10,7 +10,7 @@ VPATH     = @srcdir@

 include $(topsrcdir)/config/config.mk

-EXTRA_COMPONENTS = nsHelperAppDlg.manifest
+DISABLED_EXTRA_COMPONENTS = nsHelperAppDlg.manifest
 EXTRA_PP_COMPONENTS = nsHelperAppDlg.js

 EXTRA_JS_MODULES = \
--- a/toolkit/mozapps/downloads/moz.build
+++ b/toolkit/mozapps/downloads/moz.build
@ -8,3 +8,6 @@ TEST_DIRS += ['tests']

 MODULE = 'helperAppDlg'

+EXTRA_COMPONENTS += [
+    'nsHelperAppDlg.manifest',
+]
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@ -30,7 +30,7 @@ EXTRA_PP_COMPONENTS = \
  extensions.manifest \
  $(NULL)

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  addonManager.js \
  amContentHandler.js \
  amWebInstallListener.js \
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@ -14,3 +14,8 @@ XPIDL_SOURCES += [

 MODULE = 'extensions'

+EXTRA_COMPONENTS += [
+    'addonManager.js',
+    'amContentHandler.js',
+    'amWebInstallListener.js',
+]
--- a/toolkit/mozapps/handling/Makefile.in
+++ b/toolkit/mozapps/handling/Makefile.in
@ -9,6 +9,6 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = nsContentDispatchChooser.js nsContentDispatchChooser.manifest
+DISABLED_EXTRA_COMPONENTS = nsContentDispatchChooser.js nsContentDispatchChooser.manifest

 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/handling/moz.build
+++ b/toolkit/mozapps/handling/moz.build
@ -6,3 +6,7 @@

 MODULE = 'contentDispatchChooser'

+EXTRA_COMPONENTS += [
+    'nsContentDispatchChooser.js',
+    'nsContentDispatchChooser.manifest',
+]
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@ -9,7 +9,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
  nsUpdateTimerManager.js \
  nsUpdateTimerManager.manifest \
  $(NULL)
@ -21,7 +21,7 @@ EXTRA_PP_COMPONENTS += \
  nsUpdateServiceStub.js \
  $(NULL)

-EXTRA_COMPONENTS += \
+DISABLED_EXTRA_COMPONENTS += \
  nsUpdateService.manifest \
  $(NULL)

--- a/toolkit/mozapps/update/moz.build
+++ b/toolkit/mozapps/update/moz.build
@ -33,3 +33,12 @@ if CONFIG['MOZ_UPDATER']:

 MODULE = 'update'

+EXTRA_COMPONENTS += [
+    'nsUpdateTimerManager.js',
+    'nsUpdateTimerManager.manifest',
+]
+
+if CONFIG['MOZ_UPDATER']:
+    EXTRA_COMPONENTS += [
+        'nsUpdateService.manifest',
+    ]