author | Andrew McCreight <continuation@gmail.com> |
Mon, 05 Mar 2018 14:27:29 -0800 | |
changeset 411432 | af6c0673ec6ffc38d30d95ea42caa7001cd19ef4 |
parent 411431 | 1f3b60346b7750df21c3a93a2eef0d801d77e421 |
child 411433 | fe00ed08356dd3dab2f7dac4b7a000bcc7df953e |
push id | 101651 |
push user | aiakab@mozilla.com |
push date | Tue, 03 Apr 2018 09:42:02 +0000 |
treeherder | mozilla-inbound@99a953f1823f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 1438688 |
milestone | 61.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
|
--- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -144,200 +144,24 @@ #ifdef _AMD64_ @BINPATH@/@DLL_PREFIX@qipcap64@DLL_SUFFIX@ #else @BINPATH@/@DLL_PREFIX@qipcap@DLL_SUFFIX@ #endif #endif ; [Components] -#ifdef MOZ_ARTIFACT_BUILDS -@RESPATH@/components/prebuilt-interfaces.manifest -@RESPATH@/components/interfaces.xpt -@RESPATH@/browser/components/prebuilt-interfaces.manifest -@RESPATH@/browser/components/interfaces.xpt -#endif -@RESPATH@/components/alerts.xpt #ifdef ACCESSIBILITY #ifdef XP_WIN32 @BINPATH@/Accessible.tlb @BINPATH@/AccessibleHandler.dll @BINPATH@/AccessibleMarshal.dll @BINPATH@/IA2Marshal.dll #endif -@RESPATH@/components/accessibility.xpt #endif -@RESPATH@/components/appshell.xpt -@RESPATH@/components/appstartup.xpt -@RESPATH@/components/autocomplete.xpt -@RESPATH@/components/autoconfig.xpt -@RESPATH@/components/browser-element.xpt -@RESPATH@/browser/components/browsercompsbase.xpt -@RESPATH@/browser/components/browser-feeds.xpt -@RESPATH@/components/caps.xpt -@RESPATH@/components/chrome.xpt -#ifdef MOZ_CODE_COVERAGE -@RESPATH@/components/code-coverage.xpt -#endif -@RESPATH@/components/commandhandler.xpt -@RESPATH@/components/commandlines.xpt -@RESPATH@/components/composer.xpt -@RESPATH@/components/content_events.xpt -@RESPATH@/components/content_html.xpt -@RESPATH@/components/content_geckomediaplugins.xpt -#ifdef MOZ_WEBRTC -@RESPATH@/components/content_webrtc.xpt -#endif -@RESPATH@/components/content_xslt.xpt -@RESPATH@/components/directory.xpt -@RESPATH@/components/docshell.xpt -@RESPATH@/components/dom.xpt -@RESPATH@/components/dom_base.xpt -@RESPATH@/components/dom_bindings.xpt -#ifdef MOZ_DEBUG -@RESPATH@/components/dom_bindings_test.xpt -#endif -@RESPATH@/components/dom_file.xpt -@RESPATH@/components/dom_system.xpt -@RESPATH@/components/dom_core.xpt -@RESPATH@/components/dom_events.xpt -@RESPATH@/components/dom_geolocation.xpt -@RESPATH@/components/dom_media.xpt -@RESPATH@/components/dom_network.xpt -@RESPATH@/components/dom_notification.xpt -@RESPATH@/components/dom_html.xpt -@RESPATH@/components/dom_offline.xpt -@RESPATH@/components/dom_payments.xpt -@RESPATH@/components/dom_power.xpt -@RESPATH@/components/dom_push.xpt -@RESPATH@/components/dom_quota.xpt -@RESPATH@/components/dom_range.xpt -@RESPATH@/components/dom_security.xpt -@RESPATH@/components/dom_sidebar.xpt -@RESPATH@/components/dom_storage.xpt -@RESPATH@/components/dom_webauthn.xpt -#ifdef MOZ_WEBSPEECH -@RESPATH@/components/dom_webspeechrecognition.xpt -#endif -@RESPATH@/components/dom_workers.xpt -@RESPATH@/components/dom_xul.xpt -@RESPATH@/components/dom_presentation.xpt -@RESPATH@/components/downloads.xpt -@RESPATH@/components/editor.xpt -@RESPATH@/components/enterprisepolicies.xpt -@RESPATH@/components/extensions.xpt -@RESPATH@/components/exthandler.xpt -@RESPATH@/components/fastfind.xpt -@RESPATH@/components/feeds.xpt -@RESPATH@/components/gfx.xpt -@RESPATH@/components/html5.xpt -@RESPATH@/components/htmlparser.xpt -@RESPATH@/components/imglib2.xpt -@RESPATH@/components/inspector.xpt -@RESPATH@/components/intl.xpt -@RESPATH@/components/jar.xpt -@RESPATH@/components/jsdebugger.xpt -@RESPATH@/browser/components/jsinspector.xpt -@RESPATH@/components/layout_base.xpt -#ifdef MOZ_DEBUG -@RESPATH@/components/layout_debug.xpt -#endif -#ifdef NS_PRINTING -@RESPATH@/components/layout_printing.xpt -#endif -@RESPATH@/components/layout_xul_tree.xpt -@RESPATH@/components/layout_xul.xpt -@RESPATH@/components/locale.xpt -@RESPATH@/browser/components/migration.xpt -@RESPATH@/components/mimetype.xpt -@RESPATH@/components/mozfind.xpt -@RESPATH@/components/mozintl.xpt -@RESPATH@/components/necko_about.xpt -@RESPATH@/components/necko_cache.xpt -@RESPATH@/components/necko_cache2.xpt -@RESPATH@/components/necko_cookie.xpt -@RESPATH@/components/necko_dns.xpt -@RESPATH@/components/necko_file.xpt -@RESPATH@/components/necko_ftp.xpt -@RESPATH@/components/necko_http.xpt -@RESPATH@/components/necko_mdns.xpt -@RESPATH@/components/necko_res.xpt -@RESPATH@/components/necko_socket.xpt -@RESPATH@/components/necko_strconv.xpt -@RESPATH@/components/necko_viewsource.xpt -@RESPATH@/components/necko_websocket.xpt -#ifdef NECKO_WIFI -@RESPATH@/components/necko_wifi.xpt -#endif -@RESPATH@/components/necko_wyciwyg.xpt -@RESPATH@/components/necko.xpt -@RESPATH@/components/loginmgr.xpt -@RESPATH@/components/parentalcontrols.xpt -#ifdef MOZ_WEBRTC -@RESPATH@/components/peerconnection.xpt -#endif -@RESPATH@/components/places.xpt -@RESPATH@/components/plugin.xpt -@RESPATH@/components/pref.xpt -@RESPATH@/components/prefetch.xpt -#ifdef MOZ_GECKO_PROFILER -@RESPATH@/components/profiler.xpt -#endif -@RESPATH@/components/rdf.xpt -@RESPATH@/components/reputationservice.xpt -@RESPATH@/components/satchel.xpt -@RESPATH@/components/saxparser.xpt -@RESPATH@/browser/components/sessionstore.xpt -@RESPATH@/components/services-crypto-component.xpt -@RESPATH@/components/captivedetect.xpt -@RESPATH@/browser/components/shellservice.xpt -@RESPATH@/components/shistory.xpt -@RESPATH@/components/spellchecker.xpt -@RESPATH@/components/storage.xpt -#ifdef ENABLE_MARIONETTE -@RESPATH@/components/remote.xpt -#endif -@RESPATH@/components/toolkit_asyncshutdown.xpt -@RESPATH@/components/toolkit_filewatcher.xpt -@RESPATH@/components/toolkit_finalizationwitness.xpt -@RESPATH@/components/toolkit_osfile.xpt -@RESPATH@/components/toolkit_securityreporter.xpt -@RESPATH@/components/toolkit_perfmonitoring.xpt -@RESPATH@/components/toolkit_xulstore.xpt -@RESPATH@/components/toolkitprofile.xpt -#ifdef MOZ_ENABLE_XREMOTE -@RESPATH@/components/toolkitremote.xpt -#endif -@RESPATH@/components/txtsvc.xpt -@RESPATH@/components/txmgr.xpt -@RESPATH@/components/uconv.xpt -@RESPATH@/components/update.xpt -@RESPATH@/components/uriloader.xpt -@RESPATH@/components/urlformatter.xpt -@RESPATH@/components/webBrowser_core.xpt -@RESPATH@/components/webbrowserpersist.xpt -@RESPATH@/components/webextensions.xpt -@RESPATH@/components/widget.xpt -#ifdef XP_MACOSX -@RESPATH@/components/widget_cocoa.xpt -#endif -@RESPATH@/components/windowcreator.xpt -@RESPATH@/components/windowwatcher.xpt -@RESPATH@/components/xpcom_base.xpt -@RESPATH@/components/xpcom_system.xpt -@RESPATH@/components/xpcom_components.xpt -@RESPATH@/components/xpcom_ds.xpt -@RESPATH@/components/xpcom_io.xpt -@RESPATH@/components/xpcom_threads.xpt -@RESPATH@/components/xpcom_xpti.xpt -@RESPATH@/components/xpconnect.xpt -@RESPATH@/components/xulapp.xpt -@RESPATH@/components/xul.xpt -@RESPATH@/components/zipwriter.xpt -@RESPATH@/components/telemetry.xpt ; JavaScript components @RESPATH@/components/ConsoleAPI.manifest @RESPATH@/components/ConsoleAPIStorage.js @RESPATH@/components/BrowserElementParent.manifest @RESPATH@/components/BrowserElementParent.js @RESPATH@/components/FeedProcessor.manifest @RESPATH@/components/FeedProcessor.js @@ -366,25 +190,23 @@ @RESPATH@/browser/components/aboutdevtools-registration.js @RESPATH@/browser/components/aboutdevtools.manifest @RESPATH@/browser/components/aboutdevtoolstoolbox-registration.js @RESPATH@/browser/components/aboutdevtoolstoolbox.manifest @RESPATH@/browser/components/nsAboutCapabilities.js @RESPATH@/browser/components/aboutcapabilities.manifest @RESPATH@/browser/components/Experiments.manifest @RESPATH@/browser/components/ExperimentsService.js -@RESPATH@/browser/components/browser-newtab.xpt @RESPATH@/browser/components/aboutNewTabService.js @RESPATH@/browser/components/NewTabComponents.manifest @RESPATH@/browser/components/EnterprisePolicies.js @RESPATH@/browser/components/EnterprisePoliciesContent.js @RESPATH@/browser/components/EnterprisePolicies.manifest @RESPATH@/components/Downloads.manifest @RESPATH@/components/DownloadLegacy.js -@RESPATH@/components/thumbnails.xpt @RESPATH@/components/PageThumbsComponents.manifest @RESPATH@/components/crashmonitor.manifest @RESPATH@/components/nsCrashMonitor.js @RESPATH@/components/toolkitsearch.manifest @RESPATH@/components/nsSearchService.js @RESPATH@/components/nsSearchSuggestions.js @RESPATH@/components/nsSidebar.js #ifdef NIGHTLY_BUILD @@ -394,17 +216,16 @@ @RESPATH@/components/passwordmgr.manifest @RESPATH@/components/nsLoginInfo.js @RESPATH@/components/nsLoginManager.js @RESPATH@/components/nsLoginManagerPrompter.js @RESPATH@/components/storage-json.js @RESPATH@/components/crypto-SDR.js @RESPATH@/components/TooltipTextProvider.js @RESPATH@/components/TooltipTextProvider.manifest -@RESPATH@/components/webvtt.xpt @RESPATH@/components/WebVTT.manifest @RESPATH@/components/WebVTTParserWrapper.js @RESPATH@/components/nsHelperAppDlg.manifest @RESPATH@/components/nsHelperAppDlg.js @RESPATH@/components/NetworkGeolocationProvider.manifest @RESPATH@/components/NetworkGeolocationProvider.js @RESPATH@/components/extensions.manifest @RESPATH@/components/EditorUtils.manifest @@ -514,20 +335,16 @@ @RESPATH@/components/PeerConnection.manifest #endif @RESPATH@/chrome/marionette@JAREXT@ @RESPATH@/chrome/marionette.manifest @RESPATH@/components/marionette.manifest @RESPATH@/components/marionette.js -#ifdef MOZ_WEBSPEECH -@RESPATH@/components/dom_webspeechsynth.xpt -#endif - @RESPATH@/components/nsAsyncShutdown.manifest @RESPATH@/components/nsAsyncShutdown.js @RESPATH@/components/BuiltinProviders.manifest @RESPATH@/components/PresentationControlService.js @RESPATH@/components/PresentationDataChannelSessionTransport.js @RESPATH@/components/PresentationDataChannelSessionTransport.manifest @@ -554,20 +371,18 @@ @RESPATH@/browser/modules/* @RESPATH@/modules/* ; Safe Browsing @RESPATH@/components/nsURLClassifier.manifest @RESPATH@/components/nsUrlClassifierHashCompleter.js @RESPATH@/components/nsUrlClassifierListManager.js @RESPATH@/components/nsUrlClassifierLib.js -@RESPATH@/components/url-classifier.xpt ; Private Browsing -@RESPATH@/components/privatebrowsing.xpt @RESPATH@/components/PrivateBrowsing.manifest @RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js ; Security Reports @RESPATH@/components/SecurityReporter.manifest @RESPATH@/components/SecurityReporter.js ; ANGLE GLES-on-D3D rendering library @@ -713,25 +528,22 @@ @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ #endif @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ #endif @RESPATH@/chrome/pippki@JAREXT@ @RESPATH@/chrome/pippki.manifest -@RESPATH@/components/pipnss.xpt -@RESPATH@/components/pippki.xpt ; For process sandboxing #if defined(MOZ_SANDBOX) #if defined(XP_LINUX) @BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@ #endif -@RESPATH@/components/sandbox.xpt #endif ; for Solaris SPARC #ifdef SOLARIS bin/libfreebl_32fpu_3.so bin/libfreebl_32int_3.so bin/libfreebl_32int64_3.so #endif @@ -753,17 +565,16 @@ bin/libfreebl_32int64_3.so @BINPATH@/maintenanceservice_installer.exe #endif ; [Crash Reporter] ; #ifdef MOZ_CRASHREPORTER @RESPATH@/components/CrashService.manifest @RESPATH@/components/CrashService.js -@RESPATH@/components/toolkit_crashservice.xpt #ifdef XP_MACOSX @BINPATH@/crashreporter.app/ #else @BINPATH@/crashreporter@BIN_SUFFIX@ @RESPATH@/crashreporter.ini @BINPATH@/minidump-analyzer@BIN_SUFFIX@ #ifdef XP_UNIX @RESPATH@/Throbber-small.gif @@ -774,18 +585,16 @@ bin/libfreebl_32int64_3.so @BINPATH@/breakpadinjector.dll #endif #endif ; [ Ping Sender ] ; @BINPATH@/pingsender@BIN_SUFFIX@ -@RESPATH@/components/dom_audiochannel.xpt - ; Shutdown Terminator @RESPATH@/components/nsTerminatorTelemetry.js @RESPATH@/components/terminator.manifest #ifdef LLVM_SYMBOLIZER @BINPATH@/@LLVM_SYMBOLIZER@ #endif @@ -811,19 +620,16 @@ bin/libfreebl_32int64_3.so #ifdef XP_MACOSX @RESPATH@/fix_macosx_stack.py #endif #ifdef XP_LINUX @RESPATH@/fix_linux_stack.py #endif #endif -; Background Hang Monitor -@RESPATH@/components/backgroundhangmonitor.xpt - ; NOTE: This must match the config checks in ; /toolkit/components/backgroundhangmonitor/moz.build. #if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN) @RESPATH@/components/BHRTelemetryService.js @RESPATH@/components/BHRTelemetryService.manifest #endif #ifdef PKG_LOCALE_MANIFEST
--- a/browser/moz.build +++ b/browser/moz.build @@ -31,24 +31,16 @@ if CONFIG['MAKENSISU']: TEST_DIRS += [ 'tools/mozscreenshots', ] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -if CONFIG['MOZ_ARTIFACT_BUILDS']: - # Ensure a pre-built interfaces.xpt installed to the objdir by the artifact - # code is included by the top-level chrome.manifest. - EXTRA_COMPONENTS += [ - '../build/prebuilt-interfaces.manifest', - ] - - # These defines are read in firefox.js DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] for cdm in CONFIG['MOZ_EME_MODULES']: DEFINES['MOZ_%s_EME' % cdm.upper()] = True if CONFIG['MOZ_GPSD']: DEFINES['MOZ_GPSD'] = True
--- a/build/moz.build +++ b/build/moz.build @@ -112,15 +112,8 @@ OBJDIR_FILES += ['!/dist/bin/.lldbinit'] OBJDIR_FILES += ['/.ycm_extra_conf.py'] if CONFIG['MOZ_VALGRIND']: OBJDIR_FILES._valgrind += [ 'valgrind/cross-architecture.sup', 'valgrind/i386-pc-linux-gnu.sup', 'valgrind/x86_64-pc-linux-gnu.sup', ] - -if CONFIG['MOZ_ARTIFACT_BUILDS']: - # Ensure a pre-built interfaces.xpt installed to the objdir by the artifact - # code is included by the top-level chrome.manifest. - EXTRA_COMPONENTS += [ - 'prebuilt-interfaces.manifest', - ]
deleted file mode 100644 --- a/build/prebuilt-interfaces.manifest +++ /dev/null @@ -1,1 +0,0 @@ -interfaces interfaces.xpt
--- a/config/faster/rules.mk +++ b/config/faster/rules.mk @@ -99,19 +99,16 @@ ACDEFINES += -DBUILD_FASTER # The xpidl target in config/makefiles/xpidl requires the install manifest for # dist/idl to have been processed. When using the hybrid # FasterMake/RecursiveMake backend, this dependency is handled in the top-level # Makefile. ifndef FASTER_RECURSIVE_MAKE $(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(TOPOBJDIR)/install-dist_idl endif -# It also requires all the install manifests for dist/bin to have been processed -# because it adds interfaces.manifest references with buildlist.py. -$(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(addprefix install-,$(filter dist/bin%,$(INSTALL_MANIFESTS))) $(TOPOBJDIR)/build/application.ini: $(TOPOBJDIR)/buildid.h $(TOPOBJDIR)/source-repo.h # The manifest of allowed system add-ons should be re-built when using # "build faster". ifeq ($(MOZ_BUILD_APP),browser/app) default: $(TOPOBJDIR)/browser/app/features endif
--- a/config/makefiles/xpidl/Makefile.in +++ b/config/makefiles/xpidl/Makefile.in @@ -43,43 +43,27 @@ process_py := $(topsrcdir)/python/mozbui # still is, in the tree, simple dependencies can't detect that the XPT needs # to be rebuilt. # Add the current value of $($(xpidl_module)_deps) in the depend file, such that # we can later check if the value has changed since last build, which will # indicate whether IDLs were added or removed. # Note that removing previously built files is not covered. @echo $(basename $(notdir $@))_deps_built = $($(basename $(notdir $@))_deps) >> $(idl_deps_dir)/$(basename $(notdir $@)).pp -# Chrome manifests may be written from several Makefiles at various times during -# the build. The 'buildlist' action adds to the file if it already exists, but -# if it does exist, make considers it to be up-to-date (as we have no inputs to -# depend on). We use FORCE to ensure that we always add the interface manifest, -# whether or not the chrome manifest already exists. -%/chrome.manifest: FORCE - $(call py_action,buildlist,$@ 'manifest components/interfaces.manifest') - -chrome_manifests := @chrome_manifests@ - -%/interfaces.manifest: Makefile - $(call py_action,buildlist,$@ $(foreach xpt,$(filter $*/%,$(registered_xpt_files)),'interfaces $(notdir $(xpt))')) - -interfaces_manifests := @interfaces_manifests@ - xpidl_modules := @xpidl_modules@ -registered_xpt_files := @registered_xpt_files@ -xpt_files := $(registered_xpt_files) @xpt_files@ +xpt_files := $(addsuffix .xpt,$(xpidl_modules)) @xpidl_rules@ depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp) GARBAGE += $(xpt_files) $(depends_files) ifdef COMPILE_ENVIRONMENT -xpidl:: $(xpt_files) $(chrome_manifests) $(interfaces_manifests) +xpidl:: $(xpt_files) endif $(xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(dist_include_dir) $(dist_xpcrs_dir)) -include $(depends_files) define xpt_deps $(1): $(call mkdir_deps,$(dir $(1)))
--- a/js/xpconnect/tests/idl/moz.build +++ b/js/xpconnect/tests/idl/moz.build @@ -9,17 +9,8 @@ XPIDL_SOURCES += [ 'xpctest_bug809674.idl', 'xpctest_interfaces.idl', 'xpctest_params.idl', 'xpctest_returncode.idl', 'xpctest_utils.idl', ] XPIDL_MODULE = 'xpctest' - -# XXX: This relies on xpctest.xpt being created in dist/bin/components/ during -# the export tier AND TEST_HARNESS_FILES being processed after that. -TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.native.components += [ - '!/dist/bin/components/xpctest.xpt', -] -TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.js += [ - '!/dist/bin/components/xpctest.xpt', -]
--- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -84,175 +84,17 @@ [browser] ; [Base Browser Files] @BINPATH@/application.ini @BINPATH@/platform.ini @BINPATH@/blocklist.xml ; [Components] -#ifdef MOZ_ARTIFACT_BUILDS -@BINPATH@/components/interfaces.xpt -@BINPATH@/components/prebuilt-interfaces.manifest -#endif @BINPATH@/components/components.manifest -@BINPATH@/components/alerts.xpt -#ifdef ACCESSIBILITY -@BINPATH@/components/accessibility.xpt -#endif -@BINPATH@/components/appshell.xpt -@BINPATH@/components/appstartup.xpt -@BINPATH@/components/autocomplete.xpt -@BINPATH@/components/autoconfig.xpt -@BINPATH@/components/browser-element.xpt -@BINPATH@/components/caps.xpt -@BINPATH@/components/chrome.xpt -@BINPATH@/components/commandhandler.xpt -@BINPATH@/components/commandlines.xpt -@BINPATH@/components/composer.xpt -@BINPATH@/components/content_events.xpt -@BINPATH@/components/content_geckomediaplugins.xpt -@BINPATH@/components/content_html.xpt -@BINPATH@/components/content_webrtc.xpt -@BINPATH@/components/content_xslt.xpt -@BINPATH@/components/directory.xpt -@BINPATH@/components/docshell.xpt -@BINPATH@/components/dom.xpt -@BINPATH@/components/dom_base.xpt -@BINPATH@/components/dom_bindings.xpt -#ifdef MOZ_DEBUG -@BINPATH@/components/dom_bindings_test.xpt -#endif -@BINPATH@/components/dom_core.xpt -@BINPATH@/components/dom_events.xpt -@BINPATH@/components/dom_file.xpt -@BINPATH@/components/dom_geolocation.xpt -@BINPATH@/components/dom_media.xpt -@BINPATH@/components/dom_network.xpt -@BINPATH@/components/dom_notification.xpt -@BINPATH@/components/dom_html.xpt -@BINPATH@/components/dom_offline.xpt -@BINPATH@/components/dom_payments.xpt -@BINPATH@/components/dom_power.xpt -#ifdef MOZ_ANDROID_GCM -@BINPATH@/components/dom_push.xpt -#endif -@BINPATH@/components/dom_quota.xpt -@BINPATH@/components/dom_range.xpt -@BINPATH@/components/dom_security.xpt -@BINPATH@/components/dom_sidebar.xpt -@BINPATH@/components/dom_storage.xpt -@BINPATH@/components/dom_system.xpt -#ifdef MOZ_WEBSPEECH -@BINPATH@/components/dom_webspeechrecognition.xpt -#endif -@BINPATH@/components/dom_workers.xpt -@BINPATH@/components/dom_xhr.xpt -@BINPATH@/components/dom_xul.xpt -@BINPATH@/components/dom_presentation.xpt -@BINPATH@/components/downloads.xpt -@BINPATH@/components/editor.xpt -@BINPATH@/components/extensions.xpt -@BINPATH@/components/exthandler.xpt -@BINPATH@/components/fastfind.xpt -@BINPATH@/components/feeds.xpt -@BINPATH@/components/gfx.xpt -@BINPATH@/components/html5.xpt -@BINPATH@/components/htmlparser.xpt -@BINPATH@/components/imglib2.xpt -@BINPATH@/components/inspector.xpt -@BINPATH@/components/intl.xpt -@BINPATH@/components/jar.xpt -@BINPATH@/components/jsdebugger.xpt -@BINPATH@/components/jsinspector.xpt -@BINPATH@/components/layout_base.xpt -#ifdef NS_PRINTING -@BINPATH@/components/layout_printing.xpt -#endif -@BINPATH@/components/layout_xul_tree.xpt -@BINPATH@/components/layout_xul.xpt -@BINPATH@/components/locale.xpt -@BINPATH@/components/mimetype.xpt -@BINPATH@/components/mozfind.xpt -@BINPATH@/components/mozintl.xpt -@BINPATH@/components/necko_about.xpt -@BINPATH@/components/necko_cache.xpt -@BINPATH@/components/necko_cache2.xpt -@BINPATH@/components/necko_cookie.xpt -@BINPATH@/components/necko_dns.xpt -@BINPATH@/components/necko_file.xpt -@BINPATH@/components/necko_ftp.xpt -@BINPATH@/components/necko_http.xpt -@BINPATH@/components/necko_mdns.xpt -@BINPATH@/components/necko_res.xpt -@BINPATH@/components/necko_socket.xpt -@BINPATH@/components/necko_strconv.xpt -@BINPATH@/components/necko_viewsource.xpt -@BINPATH@/components/necko_websocket.xpt -#ifdef NECKO_WIFI -@BINPATH@/components/necko_wifi.xpt -#endif -@BINPATH@/components/necko_wyciwyg.xpt -@BINPATH@/components/necko.xpt -@BINPATH@/components/loginmgr.xpt -@BINPATH@/components/parentalcontrols.xpt -#ifdef MOZ_WEBRTC -@BINPATH@/components/peerconnection.xpt -#endif -@BINPATH@/components/plugin.xpt -@BINPATH@/components/pref.xpt -@BINPATH@/components/prefetch.xpt -#ifdef MOZ_GECKO_PROFILER -@BINPATH@/components/profiler.xpt -#endif -@BINPATH@/components/rdf.xpt -@BINPATH@/components/reputationservice.xpt -@BINPATH@/components/satchel.xpt -@BINPATH@/components/saxparser.xpt -@BINPATH@/components/services-crypto-component.xpt -@BINPATH@/components/captivedetect.xpt -@BINPATH@/components/shistory.xpt -@BINPATH@/components/spellchecker.xpt -@BINPATH@/components/storage.xpt -@BINPATH@/components/telemetry.xpt -@BINPATH@/components/toolkit_asyncshutdown.xpt -@BINPATH@/components/toolkit_filewatcher.xpt -@BINPATH@/components/toolkit_finalizationwitness.xpt -@BINPATH@/components/toolkit_osfile.xpt -@BINPATH@/components/toolkit_securityreporter.xpt -@BINPATH@/components/toolkit_perfmonitoring.xpt -@BINPATH@/components/toolkit_xulstore.xpt -@BINPATH@/components/toolkitprofile.xpt -#ifdef MOZ_ENABLE_XREMOTE -@BINPATH@/components/toolkitremote.xpt -#endif -@BINPATH@/components/txtsvc.xpt -@BINPATH@/components/txmgr.xpt -@BINPATH@/components/uconv.xpt -@BINPATH@/components/update.xpt -@BINPATH@/components/uriloader.xpt -@BINPATH@/components/urlformatter.xpt -@BINPATH@/components/webBrowser_core.xpt -@BINPATH@/components/webbrowserpersist.xpt -@BINPATH@/components/webextensions.xpt -@BINPATH@/components/widget.xpt -@BINPATH@/components/widget_android.xpt -@BINPATH@/components/windowcreator.xpt -@BINPATH@/components/windowwatcher.xpt -@BINPATH@/components/xpcom_base.xpt -@BINPATH@/components/xpcom_system.xpt -@BINPATH@/components/xpcom_components.xpt -@BINPATH@/components/xpcom_ds.xpt -@BINPATH@/components/xpcom_io.xpt -@BINPATH@/components/xpcom_threads.xpt -@BINPATH@/components/xpcom_xpti.xpt -@BINPATH@/components/xpconnect.xpt -@BINPATH@/components/xulapp.xpt -@BINPATH@/components/xul.xpt -@BINPATH@/components/zipwriter.xpt ; JavaScript components @BINPATH@/components/ConsoleAPI.manifest @BINPATH@/components/ConsoleAPIStorage.js @BINPATH@/components/NotificationStorage.js @BINPATH@/components/NotificationStorage.manifest #ifdef MOZ_ANDROID_GCM @BINPATH@/components/Push.js @@ -299,17 +141,16 @@ @BINPATH@/components/amContentHandler.js @BINPATH@/components/amWebAPI.js @BINPATH@/components/amInstallTrigger.js #ifndef RELEASE_OR_BETA @BINPATH@/components/TabSource.js #endif #endif -@BINPATH@/components/webvtt.xpt @BINPATH@/components/WebVTT.manifest @BINPATH@/components/WebVTTParserWrapper.js #ifndef MOZ_GECKOVIEW_JAR #ifdef MOZ_UPDATER @BINPATH@/components/nsUpdateService.manifest @BINPATH@/components/nsUpdateService.js @BINPATH@/components/nsUpdateServiceStub.js @@ -361,20 +202,16 @@ #ifdef MOZ_WEBRTC @BINPATH@/components/PeerConnection.js @BINPATH@/components/PeerConnection.manifest #endif @BINPATH@/components/CaptivePortalDetectComponents.manifest @BINPATH@/components/captivedetect.js -#ifdef MOZ_WEBSPEECH -@BINPATH@/components/dom_webspeechsynth.xpt -#endif - #if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) @BINPATH@/components/TestInterfaceJS.js @BINPATH@/components/TestInterfaceJS.manifest @BINPATH@/components/TestInterfaceJSMaplike.js #endif @BINPATH@/components/nsAsyncShutdown.manifest @BINPATH@/components/nsAsyncShutdown.js @@ -399,20 +236,18 @@ ; Modules @BINPATH@/modules/* ; Safe Browsing @BINPATH@/components/nsURLClassifier.manifest @BINPATH@/components/nsUrlClassifierHashCompleter.js @BINPATH@/components/nsUrlClassifierListManager.js @BINPATH@/components/nsUrlClassifierLib.js -@BINPATH@/components/url-classifier.xpt ; Private Browsing -@BINPATH@/components/privatebrowsing.xpt @BINPATH@/components/PrivateBrowsing.manifest @BINPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js ; Security Reports @BINPATH@/components/SecurityReporter.manifest @BINPATH@/components/SecurityReporter.js ; [Browser Chrome Files] @@ -477,35 +312,29 @@ #endif ; Content-accessible resources. @BINPATH@/contentaccessible/* ; svg @BINPATH@/res/svg.css -; [Personal Security Manager] -; -@BINPATH@/components/pipnss.xpt - ; For process sandboxing #if defined(MOZ_SANDBOX) @BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@ #endif ; [Crash Reporter] ; CrashService is not used on Android but the ini files are required for L10N ; strings, see bug 1191351. #ifdef MOZ_CRASHREPORTER @BINPATH@/crashreporter.ini @BINPATH@/crashreporter-override.ini #endif -@BINPATH@/components/dom_audiochannel.xpt - @BINPATH@/components/RemoteWebNavigation.js @BINPATH@/components/remotebrowserutils.manifest [mobile] @BINPATH@/chrome/geckoview@JAREXT@ @BINPATH@/chrome/geckoview.manifest #ifdef MOZ_GECKOVIEW_JAR @@ -526,17 +355,16 @@ @BINPATH@/components/ContentPermissionPrompt.js @BINPATH@/components/ImageBlockingPolicy.js @BINPATH@/components/DirectoryProvider.js @BINPATH@/components/FilePicker.js @BINPATH@/components/FxAccountsPush.js @BINPATH@/components/HelperAppDialog.js @BINPATH@/components/LoginManagerPrompter.js @BINPATH@/components/MobileComponents.manifest -@BINPATH@/components/MobileComponents.xpt @BINPATH@/components/NSSDialogService.js @BINPATH@/components/PersistentNotificationHandler.js @BINPATH@/components/PresentationDevicePrompt.js @BINPATH@/components/PresentationRequestUIGlue.js @BINPATH@/components/PromptService.js @BINPATH@/components/SessionStore.js @BINPATH@/components/Snippets.js @BINPATH@/components/XPIDialogService.js @@ -548,17 +376,14 @@ @BINPATH@/components/marionette.manifest @BINPATH@/components/marionette.js #endif #ifdef PKG_LOCALE_MANIFEST #include @PKG_LOCALE_MANIFEST@ #endif -; Background Hang Monitor -@BINPATH@/components/backgroundhangmonitor.xpt - ; NOTE: This must match the config checks in ; /toolkit/components/backgroundhangmonitor/moz.build. #if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN) @BINPATH@/components/BHRTelemetryService.js @BINPATH@/components/BHRTelemetryService.manifest #endif
--- a/netwerk/test/httpserver/moz.build +++ b/netwerk/test/httpserver/moz.build @@ -5,19 +5,16 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. XPIDL_SOURCES += [ 'nsIHttpServer.idl', ] XPIDL_MODULE = 'test_necko' -# Don't add our test-only .xpt files to the normal manifests -XPIDL_NO_MANIFEST = True - XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini'] EXTRA_COMPONENTS += [ 'httpd.js', 'httpd.manifest', ] TESTING_JS_MODULES += [
--- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -240,17 +240,16 @@ class ArtifactJob(object): class AndroidArtifactJob(ArtifactJob): product = 'mobile' package_artifact_patterns = { 'application.ini', 'platform.ini', '**/*.so', - '**/interfaces.xpt', } def process_package_artifact(self, filename, processed_filename): # Extract all .so files into the root, which will get copied into dist/bin. with JarWriter(file=processed_filename, optimize=False, compress_level=5) as writer: for p, f in UnpackFinder(JarFinder(filename, JarReader(filename))): if not any(mozpath.match(p, pat) for pat in self.package_artifact_patterns): continue @@ -278,17 +277,16 @@ class LinuxArtifactJob(ArtifactJob): 'firefox/firefox', 'firefox/firefox-bin', 'firefox/minidump-analyzer', 'firefox/pingsender', 'firefox/platform.ini', 'firefox/plugin-container', 'firefox/updater', 'firefox/**/*.so', - 'firefox/**/interfaces.xpt', } def process_package_artifact(self, filename, processed_filename): added_entry = False with JarWriter(file=processed_filename, optimize=False, compress_level=5) as writer: with tarfile.open(filename) as reader: for p, f in UnpackFinder(TarFinder(filename, reader)): @@ -377,17 +375,16 @@ class MacArtifactJob(ArtifactJob): ]), ('Contents/Resources', [ 'browser/components/libbrowsercomps.dylib', 'dependentlibs.list', # 'firefox', 'gmp-clearkey/0.1/libclearkey.dylib', # 'gmp-fake/1.0/libfake.dylib', # 'gmp-fakeopenh264/1.0/libfakeopenh264.dylib', - '**/interfaces.xpt', ]), ] with JarWriter(file=processed_filename, optimize=False, compress_level=5) as writer: root, paths = paths_no_keep_path finder = UnpackFinder(mozpath.join(source, root)) for path in paths: for p, f in finder.find(path): @@ -420,17 +417,16 @@ class MacArtifactJob(ArtifactJob): class WinArtifactJob(ArtifactJob): package_artifact_patterns = { 'firefox/dependentlibs.list', 'firefox/platform.ini', 'firefox/application.ini', 'firefox/**/*.dll', 'firefox/*.exe', - 'firefox/**/interfaces.xpt', 'firefox/*.tlb', } product = 'firefox' # These are a subset of TEST_HARNESS_BINS in testing/mochitest/Makefile.in. test_artifact_patterns = { ('bin/BadCertServer.exe', ('bin', 'bin')),
--- a/python/mozbuild/mozbuild/backend/common.py +++ b/python/mozbuild/mozbuild/backend/common.py @@ -53,50 +53,40 @@ class XPIDLManager(object): """Helps manage XPCOM IDLs in the context of the build system.""" def __init__(self, config): self.config = config self.topsrcdir = config.topsrcdir self.topobjdir = config.topobjdir self.idls = {} self.modules = {} - self.interface_manifests = {} - self.chrome_manifests = set() def register_idl(self, idl, allow_existing=False): """Registers an IDL file with this instance. The IDL file will be built, installed, etc. """ basename = mozpath.basename(idl.source_path) root = mozpath.splitext(basename)[0] xpt = '%s.xpt' % idl.module - manifest = mozpath.join(idl.install_target, 'components', 'interfaces.manifest') - chrome_manifest = mozpath.join(idl.install_target, 'chrome.manifest') entry = { 'source': idl.source_path, 'module': idl.module, 'basename': basename, 'root': root, - 'manifest': manifest, } if not allow_existing and entry['basename'] in self.idls: raise Exception('IDL already registered: %s' % entry['basename']) self.idls[entry['basename']] = entry t = self.modules.setdefault(entry['module'], (idl.install_target, set())) t[1].add(entry['root']) - if idl.add_to_manifest: - self.interface_manifests.setdefault(manifest, set()).add(xpt) - self.chrome_manifests.add(chrome_manifest) - - class BinariesCollection(object): """Tracks state of binaries produced by the build.""" def __init__(self): self.shared_libraries = [] self.programs = [] class CommonBackend(BuildBackend):
--- a/python/mozbuild/mozbuild/backend/recursivemake.py +++ b/python/mozbuild/mozbuild/backend/recursivemake.py @@ -1058,18 +1058,16 @@ class RecursiveMakeBackend(CommonBackend % idl['root']) for module in manager.modules: build_files.add_optional_exists(mozpath.join('.deps', '%s.pp' % module)) modules = manager.modules xpt_modules = sorted(modules.keys()) - xpt_files = set() - registered_xpt_files = set() mk = Makefile() for module in xpt_modules: install_target, sources = modules[module] deps = sorted(sources) # It may seem strange to have the .idl files listed as @@ -1077,67 +1075,39 @@ class RecursiveMakeBackend(CommonBackend # It is necessary to list them here to handle the case where a # new .idl is added to an xpt. If we add a new .idl and nothing # else has changed, the new .idl won't be referenced anywhere # except in the command invocation. Therefore, the .xpt won't # be rebuilt because the dependencies say it is up to date. By # listing the .idls here, we ensure the make file has a # reference to the new .idl. Since the new .idl presumably has # an mtime newer than the .xpt, it will trigger xpt generation. - xpt_path = '$(DEPTH)/%s/components/%s.xpt' % (install_target, module) - xpt_files.add(xpt_path) mk.add_statement('%s_deps = %s' % (module, ' '.join(deps))) - if install_target.startswith('dist/'): - path = mozpath.relpath(xpt_path, '$(DEPTH)/dist') - prefix, subpath = path.split('/', 1) - key = 'dist_%s' % prefix - - self._install_manifests[key].add_optional_exists(subpath) + build_files.add_optional_exists('%s.xpt' % module) rules = StringIO() mk.dump(rules, removal_guard=False) - interfaces_manifests = [] - dist_dir = mozpath.join(self.environment.topobjdir, 'dist') - for manifest, entries in manager.interface_manifests.items(): - interfaces_manifests.append(mozpath.join('$(DEPTH)', manifest)) - for xpt in sorted(entries): - registered_xpt_files.add(mozpath.join( - '$(DEPTH)', mozpath.dirname(manifest), xpt)) - - if install_target.startswith('dist/'): - path = mozpath.join(self.environment.topobjdir, manifest) - path = mozpath.relpath(path, dist_dir) - prefix, subpath = path.split('/', 1) - key = 'dist_%s' % prefix - self._install_manifests[key].add_optional_exists(subpath) - - chrome_manifests = [mozpath.join('$(DEPTH)', m) for m in sorted(manager.chrome_manifests)] - # Create dependency for output header so we force regeneration if the # header was deleted. This ideally should not be necessary. However, # some processes (such as PGO at the time this was implemented) wipe # out dist/include without regard to our install manifests. obj = self.Substitution() obj.output_path = mozpath.join(self.environment.topobjdir, 'config', 'makefiles', 'xpidl', 'Makefile') obj.input_path = mozpath.join(self.environment.topsrcdir, 'config', 'makefiles', 'xpidl', 'Makefile.in') obj.topsrcdir = self.environment.topsrcdir obj.topobjdir = self.environment.topobjdir obj.config = self.environment self._create_makefile(obj, extra=dict( - chrome_manifests = ' '.join(chrome_manifests), - interfaces_manifests = ' '.join(interfaces_manifests), xpidl_rules=rules.getvalue(), xpidl_modules=' '.join(xpt_modules), - xpt_files=' '.join(sorted(xpt_files - registered_xpt_files)), - registered_xpt_files=' '.join(sorted(registered_xpt_files)), )) def _process_program(self, obj, backend_file): backend_file.write('PROGRAM = %s\n' % self._pretty_path(obj.output_path, backend_file)) if not obj.cxx_link and not self.environment.bin_suffix: backend_file.write('PROG_IS_C_ONLY_%s := 1\n' % obj.program) def _process_host_program(self, program, backend_file):
--- a/python/mozbuild/mozbuild/frontend/context.py +++ b/python/mozbuild/mozbuild/frontend/context.py @@ -1774,24 +1774,16 @@ VARIABLES = { 'XPIDL_MODULE': (unicode, unicode, """XPCOM Interface Definition Module Name. This is the name of the ``.xpt`` file that is created by linking ``XPIDL_SOURCES`` together. If unspecified, it defaults to be the same as ``MODULE``. """), - 'XPIDL_NO_MANIFEST': (bool, bool, - """Indicate that the XPIDL module should not be added to a manifest. - - This flag exists primarily to prevent test-only XPIDL modules from being - added to the application's chrome manifest. Most XPIDL modules should - not use this flag. - """), - 'PREPROCESSED_IPDL_SOURCES': (StrictOrderingOnAppendList, list, """Preprocessed IPDL source files. These files will be preprocessed, then parsed and converted to ``.cpp`` files. """), 'IPDL_SOURCES': (StrictOrderingOnAppendList, list,
--- a/python/mozbuild/mozbuild/frontend/data.py +++ b/python/mozbuild/mozbuild/frontend/data.py @@ -191,26 +191,24 @@ class ComputedFlags(ContextDerived): class XPIDLFile(ContextDerived): """Describes an XPIDL file to be compiled.""" __slots__ = ( 'source_path', 'basename', 'module', - 'add_to_manifest', ) - def __init__(self, context, source, module, add_to_manifest): + def __init__(self, context, source, module): ContextDerived.__init__(self, context) self.source_path = source self.basename = mozpath.basename(source) self.module = module - self.add_to_manifest = add_to_manifest class BaseDefines(ContextDerived): """Context derived container object for DEFINES/HOST_DEFINES, which are OrderedDicts. """ __slots__ = ('defines') def __init__(self, context, defines):
--- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -1339,17 +1339,17 @@ class TreeMetadataEmitter(LoggingMixin): if context['XPIDL_SOURCES'] and context['DIST_INSTALL'] is False: self.log(logging.WARN, 'mozbuild_warning', dict( path=context.main_path), '{path}: DIST_INSTALL = False has no effect on XPIDL_SOURCES.') for idl in context['XPIDL_SOURCES']: yield XPIDLFile(context, mozpath.join(context.srcdir, idl), - xpidl_module, add_to_manifest=not context['XPIDL_NO_MANIFEST']) + xpidl_module) def _process_generated_files(self, context): for path in context['CONFIGURE_DEFINE_FILES']: script = mozpath.join(mozpath.dirname(mozpath.dirname(__file__)), 'action', 'process_define_files.py') yield GeneratedFile(context, script, 'process_define_file', unicode(path), [Path(context, path + '.in')])
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py +++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py @@ -682,19 +682,18 @@ class TestRecursiveMakeBackend(BackendTe m = InstallManifest(path=mozpath.join(install_dir, 'dist_idl')) self.assertEqual(len(m), 2) self.assertIn('bar.idl', m) self.assertIn('foo.idl', m) m = InstallManifest(path=mozpath.join(install_dir, 'xpidl')) self.assertIn('.deps/my_module.pp', m) - m = InstallManifest(path=os.path.join(install_dir, 'dist_bin')) - self.assertIn('components/my_module.xpt', m) - self.assertIn('components/interfaces.manifest', m) + m = InstallManifest(path=mozpath.join(install_dir, 'xpidl')) + self.assertIn('my_module.xpt', m) m = InstallManifest(path=mozpath.join(install_dir, 'dist_include')) self.assertIn('foo.h', m) p = mozpath.join(env.topobjdir, 'config/makefiles/xpidl') self.assertTrue(os.path.isdir(p)) self.assertTrue(os.path.isfile(mozpath.join(p, 'Makefile')))
--- a/testing/xpcshell/remotexpcshelltests.py +++ b/testing/xpcshell/remotexpcshelltests.py @@ -423,20 +423,16 @@ class XPCShellRemote(xpcshell.XPCShellTe local = os.path.join(self.localBin, "components/httpd.js") remoteFile = posixpath.join(self.remoteComponentsDir, "httpd.js") self.device.push(local, remoteFile) local = os.path.join(self.localBin, "components/httpd.manifest") remoteFile = posixpath.join(self.remoteComponentsDir, "httpd.manifest") self.device.push(local, remoteFile) - local = os.path.join(self.localBin, "components/test_necko.xpt") - remoteFile = posixpath.join(self.remoteComponentsDir, "test_necko.xpt") - self.device.push(local, remoteFile) - if self.options['localAPK']: remoteFile = posixpath.join(self.remoteBinDir, os.path.basename(self.options['localAPK'])) self.device.push(self.options['localAPK'], remoteFile) self.pushLibs() def pushLibs(self):
--- a/toolkit/mozapps/installer/packager.py +++ b/toolkit/mozapps/installer/packager.py @@ -180,19 +180,16 @@ class NoPkgFilesRemover(object): if not any(mozpath.match(path, spec) for spec in self._files): self._formatter.add(path, content) else: self._error(self._msg % path) def add_manifest(self, entry): self._formatter.add_manifest(entry) - def add_interfaces(self, path, content): - self._formatter.add_interfaces(path, content) - def contains(self, path): return self._formatter.contains(path) def main(): parser = ArgumentParser() parser.add_argument('-D', dest='defines', action='append', metavar="VAR[=VAL]", help='Define a variable')
--- a/xpcom/tests/moz.build +++ b/xpcom/tests/moz.build @@ -25,29 +25,23 @@ test_progs = [ SimplePrograms(test_progs) USE_LIBS += ['mfbt'] XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] if CONFIG['COMPILE_ENVIRONMENT']: TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [ - '!/dist/bin/components/xpcomtest.xpt', - ] - TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [ '!%s%s' % (f, CONFIG['BIN_SUFFIX']) for f in test_progs ] XPIDL_MODULE = 'xpcomtest' XPIDL_SOURCES += [ 'NotXPCOMTest.idl', ] -# Don't add our test-only .xpt files to the normal manifests -XPIDL_NO_MANIFEST = True - LOCAL_INCLUDES += [ '../ds', ] RESOURCE_FILES += [ 'test.properties', ]