[PMkit] Remove embedded WebExtensions support

This commit is contained in:
JustOff 2018-04-20 21:11:18 +03:00 • committed by Roy Tam
commit d87fc5357d
2 changed files with 10 additions and 4 deletions

View file

@ -128,9 +128,10 @@ EXTRA_JS_MODULES.commonjs += [
'test.js', 'test.js',
] ]
EXTRA_JS_MODULES.commonjs.sdk += [ if not CONFIG['MC_PALEMOON']:
'sdk/webextension.js', EXTRA_JS_MODULES.commonjs.sdk += [
] 'sdk/webextension.js',
]
EXTRA_JS_MODULES.commonjs.dev += [ EXTRA_JS_MODULES.commonjs.dev += [
'dev/debuggee.js', 'dev/debuggee.js',
@ -228,7 +229,6 @@ EXTRA_PP_JS_MODULES.commonjs.sdk += [
] ]
EXTRA_JS_MODULES.commonjs.sdk.addon += [ EXTRA_JS_MODULES.commonjs.sdk.addon += [
'sdk/addon/bootstrap.js',
'sdk/addon/events.js', 'sdk/addon/events.js',
'sdk/addon/host.js', 'sdk/addon/host.js',
'sdk/addon/installer.js', 'sdk/addon/installer.js',
@ -237,6 +237,10 @@ EXTRA_JS_MODULES.commonjs.sdk.addon += [
'sdk/addon/window.js', 'sdk/addon/window.js',
] ]
EXTRA_PP_JS_MODULES.commonjs.sdk.addon += [
'sdk/addon/bootstrap.js',
]
EXTRA_JS_MODULES.commonjs.sdk.browser += [ EXTRA_JS_MODULES.commonjs.sdk.browser += [
'sdk/browser/events.js', 'sdk/browser/events.js',
] ]

View file

@ -134,8 +134,10 @@ Bootstrap.prototype = {
const main = command === "test" ? "sdk/test/runner" : null; const main = command === "test" ? "sdk/test/runner" : null;
const prefsURI = `${baseURI}defaults/preferences/prefs.js`; const prefsURI = `${baseURI}defaults/preferences/prefs.js`;
#ifndef MC_PALEMOON
// Init the 'sdk/webextension' module from the bootstrap addon parameter. // Init the 'sdk/webextension' module from the bootstrap addon parameter.
require("sdk/webextension").initFromBootstrapAddonParam(addon); require("sdk/webextension").initFromBootstrapAddonParam(addon);
#endif
const { startup } = require("sdk/addon/runner"); const { startup } = require("sdk/addon/runner");
startup(reason, {loader, main, prefsURI}); startup(reason, {loader, main, prefsURI});