diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
| commit | 35c26c6c19e66fabcb230fb074e76e243df04d2b (patch) | |
| tree | 9cbdb0397c76a7477cd60c53347ab33d426f2019 /toolkit/mozapps | |
| parent | 8f35c37a9e82ea3e99780c1a001641227a00b6a9 (diff) | |
| download | UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.gz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.lz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.xz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.zip | |
Issue #1053 - Remove android support from toolkit
Note: Does not remove support completely from toolkit/mozapps/installer or from telemetry or AppConstants.jsm
Diffstat (limited to 'toolkit/mozapps')
| -rw-r--r-- | toolkit/mozapps/extensions/extensions.manifest | 6 | ||||
| -rw-r--r-- | toolkit/mozapps/extensions/internal/moz.build | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/toolkit/mozapps/extensions/extensions.manifest b/toolkit/mozapps/extensions/extensions.manifest index 7efb74a9d..b56152e10 100644 --- a/toolkit/mozapps/extensions/extensions.manifest +++ b/toolkit/mozapps/extensions/extensions.manifest @@ -1,14 +1,16 @@ component {4399533d-08d1-458c-a87a-235f74451cfa} addonManager.js contract @mozilla.org/addons/integration;1 {4399533d-08d1-458c-a87a-235f74451cfa} category update-timer addonManager @mozilla.org/addons/integration;1,getService,addon-background-update-timer,extensions.update.interval,86400 + component {7beb3ba8-6ec3-41b4-b67c-da89b8518922} amContentHandler.js contract @mozilla.org/uriloader/content-handler;1?type=application/x-xpinstall {7beb3ba8-6ec3-41b4-b67c-da89b8518922} + component {0f38e086-89a3-40a5-8ffc-9b694de1d04a} amWebInstallListener.js contract @mozilla.org/addons/web-install-listener;1 {0f38e086-89a3-40a5-8ffc-9b694de1d04a} + component {9df8ef2b-94da-45c9-ab9f-132eb55fddf1} amInstallTrigger.js contract @mozilla.org/addons/installtrigger;1 {9df8ef2b-94da-45c9-ab9f-132eb55fddf1} category JavaScript-global-property InstallTrigger @mozilla.org/addons/installtrigger;1 -#ifndef MOZ_WIDGET_ANDROID + category addon-provider-module PluginProvider resource://gre/modules/addons/PluginProvider.jsm -#endif category addon-provider-module GMPProvider resource://gre/modules/addons/GMPProvider.jsm diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build index 337df3104..12e95fb5a 100644 --- a/toolkit/mozapps/extensions/internal/moz.build +++ b/toolkit/mozapps/extensions/internal/moz.build @@ -10,16 +10,11 @@ EXTRA_JS_MODULES.addons += [ 'Content.js', 'GMPProvider.jsm', 'LightweightThemeImageOptimizer.jsm', + 'PluginProvider.jsm', 'ProductAddonChecker.jsm', 'SpellCheckDictionaryBootstrap.js', ] -# Don't ship unused providers on Android -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': - EXTRA_JS_MODULES.addons += [ - 'PluginProvider.jsm', - ] - EXTRA_PP_JS_MODULES.addons += [ 'AddonRepository.jsm', 'AddonUpdateChecker.jsm', |