bug 870370: EXTRA_COMPONENTS cleanup for conversion patches #1 & #2.
authorJoey Armstrong <joey@mozilla.com>
Wed, 03 Jul 2013 12:01:06 -0400
changeset 137357 064524edbea2edc04bcd13713361eeeb570a605a
parent 137356 30b2b15e03dc0abdc98f3e86368ca3e7bba22795
child 137358 1f94ac2ead06644c62d5374db00aadbf3bfd2e63
push id24920
push userphilringnalda@gmail.com
push dateThu, 04 Jul 2013 17:03:47 +0000
treeherderautoland@efa23d6bd3fa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs870370
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 870370: EXTRA_COMPONENTS cleanup for conversion patches #1 & #2.
browser/components/Makefile.in
browser/components/downloads/src/Makefile.in
browser/components/feeds/src/Makefile.in
browser/components/migration/src/Makefile.in
browser/components/places/src/Makefile.in
browser/components/sessionstore/src/Makefile.in
browser/components/shell/src/Makefile.in
dom/activities/src/Makefile.in
dom/alarm/Makefile.in
dom/apps/src/Makefile.in
dom/base/Makefile.in
dom/browser-element/Makefile.in
dom/contacts/Makefile.in
dom/identity/Makefile.in
dom/media/Makefile.in
dom/network/src/Makefile.in
toolkit/components/downloads/Makefile.in
toolkit/components/feeds/Makefile.in
toolkit/components/filepicker/Makefile.in
toolkit/components/jsdownloads/src/Makefile.in
toolkit/components/passwordmgr/Makefile.in
toolkit/components/places/Makefile.in
toolkit/components/satchel/Makefile.in
toolkit/components/search/Makefile.in
toolkit/components/telemetry/Makefile.in
toolkit/components/url-classifier/Makefile.in
toolkit/components/urlformatter/Makefile.in
toolkit/mozapps/downloads/Makefile.in
toolkit/mozapps/extensions/Makefile.in
toolkit/mozapps/update/Makefile.in
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -4,13 +4,9 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserComponents.manifest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/downloads/src/Makefile.in
+++ b/browser/components/downloads/src/Makefile.in
@@ -4,15 +4,9 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserDownloads.manifest \
-  DownloadsUI.js \
-  DownloadsStartup.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -12,17 +12,12 @@ include $(DEPTH)/config/autoconf.mk
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 DEFINES += \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
 	$(NULL)
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserFeeds.manifest \
-	FeedConverter.js \
-	WebContentConverter.js \
-  $(NULL)
 
 LOCAL_INCLUDES = -I$(srcdir)/../../build
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -7,24 +7,18 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
-DISABLED_EXTRA_COMPONENTS = \
-  ProfileMigrator.js \
-  FirefoxProfileMigrator.js \
-  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
-DISABLED_EXTRA_COMPONENTS += IEProfileMigrator.js \
-                    $(NULL)
 
 DEFINES += -DHAS_IE_MIGRATOR -DHAS_SAFARI_MIGRATOR
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DHAS_SAFARI_MIGRATOR
 endif
 
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@@ -5,15 +5,10 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserPlaces.manifest \
-  PlacesProtocolHandler.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
--- a/browser/components/sessionstore/src/Makefile.in
+++ b/browser/components/sessionstore/src/Makefile.in
@@ -5,19 +5,13 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  nsSessionStore.manifest \
-  nsSessionStore.js \
-  nsSessionStartup.js \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES := \
 	SessionStore.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
-DISABLED_EXTRA_COMPONENTS = nsSetDefaultBrowser.js nsSetDefaultBrowser.manifest
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
   -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\"
 
 CXXFLAGS += $(TK_CFLAGS)
 
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -11,18 +11,11 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_activities_s
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  ActivityOptions.js \
-  ActivityProxy.js \
-  ActivityRequestHandler.js \
-  ActivityWrapper.js \
-  Activities.manifest \
-  $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -11,17 +11,13 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME        = domalarm_s
 LIBXUL_LIBRARY      = 1
 FORCE_STATIC_LIB    = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-DISABLED_EXTRA_COMPONENTS =       \
-  AlarmsManager.js       \
-  AlarmsManager.manifest \
-  $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@@ -4,20 +4,15 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  AppsService.js \
-  AppsService.manifest \
-  Webapps.manifest \
-  $(NULL)
 
 EXTRA_PP_JS_MODULES += \
   Webapps.jsm \
   AppsUtils.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -10,22 +10,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= jsdombase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
-DISABLED_EXTRA_COMPONENTS = \
-  SiteSpecificUserAgent.js \
-  SiteSpecificUserAgent.manifest \
-  ConsoleAPI.js \
-  ConsoleAPI.manifest \
-  $(NULL)
 
 include $(topsrcdir)/dom/dom-config.mk
 
 ifdef MOZ_JSDEBUGGER
 DEFINES += -DMOZ_JSDEBUGGER
 endif
 
 ifdef MOZ_B2G_RIL
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -11,20 +11,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_browserelement_s
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserElementParent.js \
-  BrowserElementParent.manifest \
-  $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
--- a/dom/contacts/Makefile.in
+++ b/dom/contacts/Makefile.in
@@ -6,14 +6,10 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 VPATH += $(srcdir)/fallback
 
-DISABLED_EXTRA_COMPONENTS =        \
-  ContactManager.js       \
-  ContactManager.manifest \
-  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/identity/Makefile.in
+++ b/dom/identity/Makefile.in
@@ -6,19 +6,14 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-    nsDOMIdentity.js \
-    nsIDService.js \
-    Identity.manifest \
-    $(NULL)
 
 EXTRA_PP_JS_MODULES = \
     DOMIdentity.jsm \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -12,20 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_media_s
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  PeerConnection.js \
-  PeerConnection.manifest \
-  $(NULL)
 
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/webrtc/trunk/webrtc \
   -I$(topsrcdir)/media/webrtc/signaling/src/common \
   $(NULL)
 endif
 
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -9,27 +9,18 @@ VPATH            = $(srcdir)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_network_s
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
-DISABLED_EXTRA_COMPONENTS = \
-	TCPSocket.js \
-	TCPSocketParentIntermediary.js \
-	TCPSocket.manifest \
-	$(NULL)
 
 ifdef MOZ_B2G_RIL
-DISABLED_EXTRA_COMPONENTS += \
-  NetworkStatsManager.manifest \
-  NetworkStatsManager.js \
-  $(NULL)
 endif
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -12,20 +12,11 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = download_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 # definition of MOZ_SUITE is only added via config.mk
 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.
-DISABLED_EXTRA_COMPONENTS = \
-  nsDownloadManagerUI.js \
-  nsDownloadManagerUI.manifest \
-  $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -9,17 +9,16 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MOZILLA_INTERNAL_API = 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
-DISABLED_EXTRA_COMPONENTS = FeedProcessor.js FeedProcessor.manifest
 
 include $(topsrcdir)/config/rules.mk
 
 ABS_SRCDIR := $(call core_abspath,$(srcdir))
 ifeq ($(OS_ARCH),WINNT)
 
 ABS_DEPTH := $(call core_abspath,$(DEPTH))
 
--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@@ -12,13 +12,12 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_XUL
 ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsFileViewModule
 LIBXUL_LIBRARY = 1
-DISABLED_EXTRA_COMPONENTS = nsFilePicker.js
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/jsdownloads/src/Makefile.in
+++ b/toolkit/components/jsdownloads/src/Makefile.in
@@ -4,18 +4,14 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  Downloads.manifest \
-  DownloadLegacy.js \
-  $(NULL)
 
 EXTRA_PP_JS_MODULES = \
   DownloadIntegration.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@@ -4,18 +4,9 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  crypto-SDR.js \
-  nsLoginInfo.js \
-  nsLoginManager.js \
-  nsLoginManagerPrompter.js \
-  passwordmgr.manifest \
-  storage-Legacy.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -14,27 +14,18 @@ LIBRARY_NAME  = places
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 MODULE_NAME = nsPlacesModule
 IS_COMPONENT = 1
 
 LOCAL_INCLUDES += -I$(srcdir)/../build
 
-DISABLED_EXTRA_COMPONENTS = \
-  toolkitplaces.manifest \
-  nsLivemarkService.js \
-  nsTaggingService.js \
-  nsPlacesExpiration.js \
-  PlacesCategoriesStarter.js \
-  ColorAnalyzer.js \
-  $(NULL)
 
 ifdef MOZ_XUL
-DISABLED_EXTRA_COMPONENTS += nsPlacesAutoComplete.js nsPlacesAutoComplete.manifest
 endif
 
 EXTRA_PP_JS_MODULES = \
   BookmarkHTMLUtils.jsm \
   PlacesUtils.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -13,20 +13,14 @@ MODULE_NAME = satchel
 IS_COMPONENT = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(NULL)
 
-DISABLED_EXTRA_COMPONENTS = \
-  nsFormAutoComplete.js \
-  FormHistoryStartup.js \
-  nsInputListAutoComplete.js \
-  satchel.manifest \
-  $(NULL)
 
 EXTRA_PP_JS_MODULES = \
   FormHistory.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@@ -4,16 +4,12 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  toolkitsearch.manifest \
-  nsSearchSuggestions.js \
-  $(NULL)
 
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -17,19 +17,16 @@ MODULE_NAME = telemetry
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 FAIL_ON_WARNINGS = 1
 
 LIBRARY_NAME = telemetry
 MSVC_ENABLE_PGO := 1
 
-DISABLED_EXTRA_COMPONENTS = \
-  TelemetryPing.manifest \
-  $(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/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -15,14 +15,10 @@ LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(SQLITE_CFLAGS) \
   $(NULL)
 
-DISABLED_EXTRA_COMPONENTS = \
-  nsUrlClassifierHashCompleter.js \
-  nsURLClassifier.manifest \
-  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/urlformatter/Makefile.in
+++ b/toolkit/components/urlformatter/Makefile.in
@@ -5,19 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  nsURLFormatter.manifest \
-  $(NULL)
 
 export:: google_api_key
 
 EXTRA_PP_COMPONENTS_FLAGS = -I google_api_key
 
 include $(topsrcdir)/config/rules.mk
 
 google_api_key:
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -5,13 +5,12 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-DISABLED_EXTRA_COMPONENTS = nsHelperAppDlg.manifest
 
 EXTRA_PP_JS_MODULES = DownloadTaskbarProgress.jsm
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -20,21 +20,16 @@ DEFINES += -DMOZ_EXTENSIONS_DB_SCHEMA=14
 # Additional debugging info is exposed in debug builds, or by setting the
 # MOZ_EM_DEBUG environment variable when building.
 ifneq (,$(MOZ_EM_DEBUG))
 DEFINES += -DMOZ_EM_DEBUG=1
 else ifdef MOZ_DEBUG
 DEFINES += -DMOZ_EM_DEBUG=1
 endif
 
-DISABLED_EXTRA_COMPONENTS = \
-  addonManager.js \
-  amContentHandler.js \
-  amWebInstallListener.js \
-  $(NULL)
 
 EXTRA_PP_JS_MODULES = \
   AddonManager.jsm \
   XPIProvider.jsm \
   XPIProviderUtils.js \
   $(NULL)
 
 EXTRA_DSO_LDOPTS = \
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -4,22 +4,15 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  nsUpdateTimerManager.js \
-  nsUpdateTimerManager.manifest \
-  $(NULL)
 
 ifdef MOZ_UPDATER
 
-DISABLED_EXTRA_COMPONENTS += \
-  nsUpdateService.manifest \
-  $(NULL)
 
 endif
 
 include $(topsrcdir)/config/rules.mk