summaryrefslogtreecommitdiffstats
path: root/toolkit/moz.build
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/moz.build')
-rw-r--r--toolkit/moz.build19
1 files changed, 8 insertions, 11 deletions
diff --git a/toolkit/moz.build b/toolkit/moz.build
index c0f7dc214..9c5102a01 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -27,16 +27,15 @@ if CONFIG['MOZ_JETPACK']:
DIRS += ['mozapps/extensions']
-if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+if CONFIG['MOZ_UPDATER']:
DIRS += ['mozapps/update']
-
-if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-# Including mozapps/update/common-standalone allows the maintenance service
-# to be built so the maintenance service can be used for things other than
-# updating applications.
- DIRS += [
- 'mozapps/update/common-standalone',
- ]
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+ # Including mozapps/update/common-standalone allows the maintenance service
+ # to be built so the maintenance service can be used for things other than
+ # updating applications.
+ DIRS += [
+ 'mozapps/update/common-standalone',
+ ]
DIRS += ['xre']
@@ -46,5 +45,3 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
DIRS += ['system/osxproxy']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
DIRS += ['system/windowsproxy']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
- DIRS += ['system/androidproxy']