Bug 1498404 - Fix some errors in manifests r=froydnj
authorAndrew McCreight <continuation@gmail.com>
Tue, 16 Oct 2018 13:26:23 +0000
changeset 499939 a3521c2b925b7ab1847031a027730962179eea9e
parent 499938 56d027190d7ba66c1097f0d11c221b4a0b8ee4e7
child 499940 88f1a7ca5c3f31a5b5d53fc5231328965f9df4a0
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1498404, 1438688
milestone64.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 1498404 - Fix some errors in manifests r=froydnj In FxAccountsComponents.manifest, the previous line registers the component CID, but only for the main process. This means we hit an error while parsing the manifest in the child process, because the CID is not recognized. The fix is simply to not try to use the CID to register the contract in the child process. As for the rest of the changes, since bug 1438688, XPT information is compiled into the Firefox binary, so the interfaces manifest entry is no longer needed. This patch removes instances of this line from manifest files. This makes some manifest files empty, so the patch also removes the now-empty files. Differential Revision: https://phabricator.services.mozilla.com/D8751
js/xpconnect/tests/components/js/xpctest.manifest
js/xpconnect/tests/components/native/moz.build
js/xpconnect/tests/components/native/xpctest.manifest
services/fxaccounts/FxAccountsComponents.manifest
xpcom/tests/unit/test_notxpcom_scriptable.js
xpcom/tests/unit/xpcomtest.manifest
xpcom/tests/unit/xpcshell.ini
--- a/js/xpconnect/tests/components/js/xpctest.manifest
+++ b/js/xpconnect/tests/components/js/xpctest.manifest
@@ -19,10 +19,8 @@ contract @mozilla.org/js/xpc/test/js/Int
 component {90ec5c9e-f6da-406b-9a38-14d00f59db76} xpctest_interfaces.js
 contract @mozilla.org/js/xpc/test/js/TestInterfaceAll;1 {90ec5c9e-f6da-406b-9a38-14d00f59db76}
 
 component {38dd78aa-467f-4fad-8dcf-4383a743e235} xpctest_returncode_child.js
 contract @mozilla.org/js/xpc/test/js/ReturnCodeChild;1 {38dd78aa-467f-4fad-8dcf-4383a743e235}
 
 component {e86573c4-a384-441a-8c92-7b99e8575b28} xpctest_utils.js
 contract @mozilla.org/js/xpc/test/js/TestUtils;1 {e86573c4-a384-441a-8c92-7b99e8575b28}
-
-interfaces xpctest.xpt
--- a/js/xpconnect/tests/components/native/moz.build
+++ b/js/xpconnect/tests/components/native/moz.build
@@ -3,20 +3,16 @@
 # 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/.
 
 EXPORTS += [
     'xpctest_private.h',
 ]
 
-EXTRA_COMPONENTS += [
-    'xpctest.manifest',
-]
-
 UNIFIED_SOURCES += [
     'xpctest_attributes.cpp',
     'xpctest_module.cpp',
     'xpctest_params.cpp',
     'xpctest_returncode.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/js/xpconnect/tests/components/native/xpctest.manifest
+++ /dev/null
@@ -1,1 +0,0 @@
-interfaces xpctest.xpt
--- a/services/fxaccounts/FxAccountsComponents.manifest
+++ b/services/fxaccounts/FxAccountsComponents.manifest
@@ -1,4 +1,4 @@
 # FxAccountsPush.js
 component {1b7db999-2ecd-4abf-bb95-a726896798ca} FxAccountsPush.js process=main
-contract @mozilla.org/fxaccounts/push;1 {1b7db999-2ecd-4abf-bb95-a726896798ca}
+contract @mozilla.org/fxaccounts/push;1 {1b7db999-2ecd-4abf-bb95-a726896798ca} process=main
 category push chrome://fxa-device-update @mozilla.org/fxaccounts/push;1
--- a/xpcom/tests/unit/test_notxpcom_scriptable.js
+++ b/xpcom/tests/unit/test_notxpcom_scriptable.js
@@ -4,19 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const kCID = Components.ID("{1f9f7181-e6c5-4f4c-8f71-08005cec8468}");
 const kContract = "@testing/notxpcomtest";
 
 function run_test() {
-  let manifest = do_get_file("xpcomtest.manifest");
   let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
-  registrar.autoRegister(manifest);
 
   ok(Ci.ScriptableWithNotXPCOM);
 
   let method1Called = false;
 
   let testObject = {
     QueryInterface: ChromeUtils.generateQI([Ci.ScriptableOK,
                                             Ci.ScriptableWithNotXPCOM,
deleted file mode 100644
--- a/xpcom/tests/unit/xpcomtest.manifest
+++ /dev/null
@@ -1,1 +0,0 @@
-interfaces xpcomtest.xpt
--- a/xpcom/tests/unit/xpcshell.ini
+++ b/xpcom/tests/unit/xpcshell.ini
@@ -1,16 +1,15 @@
 [DEFAULT]
 head = head_xpcom.js
 support-files =
   bug725015.manifest
   compmgr_warnings.manifest
   data/**
   xpcomtest.xpt
-  xpcomtest.manifest
 generated-files =
   xpcomtest.xpt
 
 [test_bug121341.js]
 [test_bug325418.js]
 [test_bug332389.js]
 [test_bug333505.js]
 [test_bug364285-1.js]