diff options
| author | JustOff <Off.Just.Off@gmail.com> | 2018-04-20 21:11:18 +0300 |
|---|---|---|
| committer | JustOff <Off.Just.Off@gmail.com> | 2018-04-20 21:11:18 +0300 |
| commit | 4c0556f9283c8c5c6ac8db9d454e2116d571e997 (patch) | |
| tree | 3550a3cac17b818e40c6e1000e2854b31f768b36 | |
| parent | 7d7df95f2866c5c45f0aaa77baa2b5508ea9b1c7 (diff) | |
| download | UXP-4c0556f9283c8c5c6ac8db9d454e2116d571e997.tar UXP-4c0556f9283c8c5c6ac8db9d454e2116d571e997.tar.gz UXP-4c0556f9283c8c5c6ac8db9d454e2116d571e997.tar.lz UXP-4c0556f9283c8c5c6ac8db9d454e2116d571e997.tar.xz UXP-4c0556f9283c8c5c6ac8db9d454e2116d571e997.zip | |
[PMkit] Remove embedded WebExtensions support
| -rw-r--r-- | toolkit/jetpack/moz.build | 12 | ||||
| -rw-r--r-- | toolkit/jetpack/sdk/addon/bootstrap.js | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/toolkit/jetpack/moz.build b/toolkit/jetpack/moz.build index ad11e90a3..1e1b48f3d 100644 --- a/toolkit/jetpack/moz.build +++ b/toolkit/jetpack/moz.build @@ -128,9 +128,10 @@ EXTRA_JS_MODULES.commonjs += [ 'test.js', ] -EXTRA_JS_MODULES.commonjs.sdk += [ - 'sdk/webextension.js', -] +if not CONFIG['MC_PALEMOON']: + EXTRA_JS_MODULES.commonjs.sdk += [ + 'sdk/webextension.js', + ] EXTRA_JS_MODULES.commonjs.dev += [ 'dev/debuggee.js', @@ -228,7 +229,6 @@ EXTRA_PP_JS_MODULES.commonjs.sdk += [ ] EXTRA_JS_MODULES.commonjs.sdk.addon += [ - 'sdk/addon/bootstrap.js', 'sdk/addon/events.js', 'sdk/addon/host.js', 'sdk/addon/installer.js', @@ -237,6 +237,10 @@ EXTRA_JS_MODULES.commonjs.sdk.addon += [ 'sdk/addon/window.js', ] +EXTRA_PP_JS_MODULES.commonjs.sdk.addon += [ + 'sdk/addon/bootstrap.js', +] + EXTRA_JS_MODULES.commonjs.sdk.browser += [ 'sdk/browser/events.js', ] diff --git a/toolkit/jetpack/sdk/addon/bootstrap.js b/toolkit/jetpack/sdk/addon/bootstrap.js index 0397d91e5..9eb5efac7 100644 --- a/toolkit/jetpack/sdk/addon/bootstrap.js +++ b/toolkit/jetpack/sdk/addon/bootstrap.js @@ -134,8 +134,10 @@ Bootstrap.prototype = { const main = command === "test" ? "sdk/test/runner" : null; const prefsURI = `${baseURI}defaults/preferences/prefs.js`; +#ifndef MC_PALEMOON // Init the 'sdk/webextension' module from the bootstrap addon parameter. require("sdk/webextension").initFromBootstrapAddonParam(addon); +#endif const { startup } = require("sdk/addon/runner"); startup(reason, {loader, main, prefsURI}); |