mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 01:48:05 +00:00
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 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
6de37261e9
commit
2df0136940
@ -24,5 +24,3 @@ contract @mozilla.org/js/xpc/test/js/ReturnCodeChild;1 {38dd78aa-467f-4fad-8dcf-
|
||||
|
||||
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
|
||||
|
@ -8,10 +8,6 @@ EXPORTS += [
|
||||
'xpctest_private.h',
|
||||
]
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'xpctest.manifest',
|
||||
]
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
'xpctest_attributes.cpp',
|
||||
'xpctest_module.cpp',
|
||||
|
@ -1 +0,0 @@
|
||||
interfaces xpctest.xpt
|
@ -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
|
||||
|
@ -9,9 +9,7 @@ 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);
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
interfaces xpcomtest.xpt
|
@ -5,7 +5,6 @@ support-files =
|
||||
compmgr_warnings.manifest
|
||||
data/**
|
||||
xpcomtest.xpt
|
||||
xpcomtest.manifest
|
||||
generated-files =
|
||||
xpcomtest.xpt
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user