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/xre/moz.build | |
| 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/xre/moz.build')
| -rw-r--r-- | toolkit/xre/moz.build | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index b00b419c8..4ad9926a8 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -46,11 +46,6 @@ if CONFIG['MOZ_X11']: EXPORTS += ['nsX11ErrorHandler.h'] UNIFIED_SOURCES += ['nsX11ErrorHandler.cpp'] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - UNIFIED_SOURCES += [ - 'nsAndroidStartup.cpp', - ] - UNIFIED_SOURCES += [ 'CreateAppData.cpp', 'nsConsoleWriter.cpp', @@ -79,10 +74,10 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']: ] if CONFIG['MOZ_UPDATER']: - if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': - UNIFIED_SOURCES += [ - 'nsUpdateDriver.cpp', - ] + DEFINES['MOZ_UPDATER'] = True + UNIFIED_SOURCES += [ + 'nsUpdateDriver.cpp', + ] include('/ipc/chromium/chromium-config.mozbuild') @@ -98,17 +93,11 @@ for var in ('MOZ_APP_NAME', 'MOZ_WIDGET_TOOLKIT'): DEFINES[var] = '"%s"' % CONFIG[var] -if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': - DEFINES['MOZ_UPDATER'] = True - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': DEFINES['WIN32_LEAN_AND_MEAN'] = True DEFINES['UNICODE'] = True DEFINES['_UNICODE'] = True -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - DEFINES['ANDROID_PACKAGE_NAME'] = '"%s"' % CONFIG['ANDROID_PACKAGE_NAME'] - if CONFIG['TARGET_XPCOM_ABI']: DEFINES['TARGET_OS_ABI'] = '"%s_%s"' % (CONFIG['OS_TARGET'], CONFIG['TARGET_XPCOM_ABI']) |