diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:56:02 +0200 |
| commit | d20ca24a070d547be3bce4d513ef151b6be5f955 (patch) | |
| tree | b0b56d41c3f41db217e8f894c0545a0217dbba4f /toolkit/modules | |
| parent | b2ca17a29814f6aaf043240cd1ec2f86ca989419 (diff) | |
| download | UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.gz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.lz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.xz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.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/modules')
| -rw-r--r-- | toolkit/modules/Services.jsm | 3 | ||||
| -rw-r--r-- | toolkit/modules/moz.build | 16 |
2 files changed, 7 insertions, 12 deletions
diff --git a/toolkit/modules/Services.jsm b/toolkit/modules/Services.jsm index 9b5082efd..09e5df077 100644 --- a/toolkit/modules/Services.jsm +++ b/toolkit/modules/Services.jsm @@ -51,9 +51,6 @@ XPCOMUtils.defineLazyGetter(Services, "ppmm", () => { }); var initTable = [ -#ifdef MOZ_WIDGET_ANDROID - ["androidBridge", "@mozilla.org/android/bridge;1", "nsIAndroidBridge"], -#endif ["appShell", "@mozilla.org/appshell/appShellService;1", "nsIAppShellService"], ["cache", "@mozilla.org/network/cache-service;1", "nsICacheService"], ["cache2", "@mozilla.org/netwerk/cache-storage-service;1", "nsICacheStorageService"], diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index c386759e7..062388d24 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -105,16 +105,14 @@ EXTRA_PP_JS_MODULES += [ 'Services.jsm', ] -if 'Android' != CONFIG['OS_TARGET']: - EXTRA_PP_JS_MODULES += [ - 'LightweightThemeConsumer.jsm', - ] - DIRS += [ - 'subprocess', - ] -else: - DEFINES['ANDROID'] = True +EXTRA_PP_JS_MODULES += [ + 'LightweightThemeConsumer.jsm', +] + +DIRS += [ + 'subprocess', +] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': |