diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-20 20:16:18 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-20 20:16:18 -0400 |
| commit | 94a484dd7e224ef6f4fc5994fa50478d41f72638 (patch) | |
| tree | 5d91fbb0d1ebeeb1cf0a9ab266effb29ce4c1764 /toolkit/jetpack/sdk/addon | |
| parent | 754ad610489603f80ea38bbd2cf18b28f0d8bf1d (diff) | |
| parent | b3bf60f4264b9acfbd2cb34fed4a66915012803c (diff) | |
| download | UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.gz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.lz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.xz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.zip | |
Merge branch 'master' into xulrunner
Diffstat (limited to 'toolkit/jetpack/sdk/addon')
| -rw-r--r-- | toolkit/jetpack/sdk/addon/bootstrap.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/toolkit/jetpack/sdk/addon/bootstrap.js b/toolkit/jetpack/sdk/addon/bootstrap.js index 0397d91e5..6c5827f1e 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`; +#ifdef MOZ_WEBEXTENSIONS // 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}); |