bug 870370: EXTRA_COMPONENTS cleanup for conversion patches #1 & #2.

UltraBlame original commit: 064524edbea2edc04bcd13713361eeeb570a605a
marco-c · Sep 29, 2019 · a09c4ff · a09c4ff
1 parent c6f61ea
commit a09c4ff
Show file tree

Hide file tree

Showing 30 changed files with 0 additions and 147 deletions.
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
@@ -9,8 +9,4 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserComponents.manifest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/downloads/src/Makefile.in b/browser/components/downloads/src/Makefile.in
@@ -9,10 +9,4 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserDownloads.manifest \
-  DownloadsUI.js \
-  DownloadsStartup.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in
@@ -17,11 +17,6 @@ DEFINES += \
 	-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
 	$(NULL)
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserFeeds.manifest \
-	FeedConverter.js \
-	WebContentConverter.js \
-  $(NULL)
 
 LOCAL_INCLUDES = -I$(srcdir)/../../build
 

diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in
@@ -12,14 +12,8 @@ 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

diff --git a/browser/components/places/src/Makefile.in b/browser/components/places/src/Makefile.in
@@ -10,10 +10,5 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  BrowserPlaces.manifest \
-  PlacesProtocolHandler.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/browser/components/sessionstore/src/Makefile.in b/browser/components/sessionstore/src/Makefile.in
@@ -10,12 +10,6 @@ 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)

diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
@@ -13,7 +13,6 @@ 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
 

diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in
@@ -16,13 +16,6 @@ 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
diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in
@@ -16,10 +16,6 @@ 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

diff --git a/dom/apps/src/Makefile.in b/dom/apps/src/Makefile.in
@@ -9,11 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  AppsService.js \
-  AppsService.manifest \
-  Webapps.manifest \
-  $(NULL)
 
 EXTRA_PP_JS_MODULES += \
   Webapps.jsm \

diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
@@ -15,12 +15,6 @@ 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
 

diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in
@@ -16,10 +16,6 @@ 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

diff --git a/dom/contacts/Makefile.in b/dom/contacts/Makefile.in
@@ -11,9 +11,5 @@ include $(DEPTH)/config/autoconf.mk
 
 VPATH += $(srcdir)/fallback
 
-DISABLED_EXTRA_COMPONENTS =        \
-  ContactManager.js       \
-  ContactManager.manifest \
-  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/identity/Makefile.in b/dom/identity/Makefile.in
@@ -11,11 +11,6 @@ relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-    nsDOMIdentity.js \
-    nsIDService.js \
-    Identity.manifest \
-    $(NULL)
 
 EXTRA_PP_JS_MODULES = \
     DOMIdentity.jsm \

diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in
@@ -17,10 +17,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  PeerConnection.js \
-  PeerConnection.manifest \
-  $(NULL)
 
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \

diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in
@@ -14,17 +14,8 @@ 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

diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
@@ -17,15 +17,6 @@ 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)
diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in
@@ -14,7 +14,6 @@ MOZILLA_INTERNAL_API = 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
-DISABLED_EXTRA_COMPONENTS = FeedProcessor.js FeedProcessor.manifest
 
 include $(topsrcdir)/config/rules.mk
 

diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in
@@ -17,7 +17,6 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsFileViewModule
 LIBXUL_LIBRARY = 1
-DISABLED_EXTRA_COMPONENTS = nsFilePicker.js
 endif
 endif
 

diff --git a/toolkit/components/jsdownloads/src/Makefile.in b/toolkit/components/jsdownloads/src/Makefile.in
@@ -9,10 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  Downloads.manifest \
-  DownloadLegacy.js \
-  $(NULL)
 
 EXTRA_PP_JS_MODULES = \
   DownloadIntegration.jsm \

diff --git a/toolkit/components/passwordmgr/Makefile.in b/toolkit/components/passwordmgr/Makefile.in
@@ -9,13 +9,4 @@ 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
diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in
@@ -19,17 +19,8 @@ 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 = \

diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in
@@ -18,12 +18,6 @@ LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(NULL)
 
-DISABLED_EXTRA_COMPONENTS = \
-  nsFormAutoComplete.js \
-  FormHistoryStartup.js \
-  nsInputListAutoComplete.js \
-  satchel.manifest \
-  $(NULL)
 
 EXTRA_PP_JS_MODULES = \
   FormHistory.jsm \

diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in
@@ -9,10 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  toolkitsearch.manifest \
-  nsSearchSuggestions.js \
-  $(NULL)
 
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 

diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
@@ -22,9 +22,6 @@ 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

diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in
@@ -20,9 +20,5 @@ LOCAL_INCLUDES = \
   $(SQLITE_CFLAGS) \
   $(NULL)
 
-DISABLED_EXTRA_COMPONENTS = \
-  nsUrlClassifierHashCompleter.js \
-  nsURLClassifier.manifest \
-  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/urlformatter/Makefile.in b/toolkit/components/urlformatter/Makefile.in
@@ -10,9 +10,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_COMPONENTS = \
-  nsURLFormatter.manifest \
-  $(NULL)
 
 export:: google_api_key
 

diff --git a/toolkit/mozapps/downloads/Makefile.in b/toolkit/mozapps/downloads/Makefile.in
@@ -10,7 +10,6 @@ VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-DISABLED_EXTRA_COMPONENTS = nsHelperAppDlg.manifest
 
 EXTRA_PP_JS_MODULES = DownloadTaskbarProgress.jsm
 

diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in
@@ -25,11 +25,6 @@ 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 \

diff --git a/toolkit/mozapps/update/Makefile.in b/toolkit/mozapps/update/Makefile.in
@@ -9,16 +9,9 @@ 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,7 +10,6 @@ VPATH = @srcdir@

		include $(topsrcdir)/config/config.mk

		DISABLED_EXTRA_COMPONENTS = nsHelperAppDlg.manifest

		EXTRA_PP_JS_MODULES = DownloadTaskbarProgress.jsm

Expand Down