1 files changed, 4 insertions, 5 deletions
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 509332800..5dba09a32 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -25,7 +25,6 @@ DIRS += [
     'crashmonitor',
     'diskspacewatcher',
     'downloads',
-    'extensions',
     'exthelper',
     'filewatcher',
     'finalizationwitness',
@@ -68,18 +67,18 @@ DIRS += [
     'xulstore'
 ]
 
+if CONFIG['MOZ_WEBEXTENSIONS']:
+    DIRS += ['webextensions']
+
 if CONFIG['ENABLE_INTL_API']:
     DIRS += ['mozintl']
 
-if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+if not CONFIG['MOZ_FENNEC']:
     DIRS += ['narrate', 'viewsource'];
 
     if CONFIG['NS_PRINTING']:
         DIRS += ['printing']
 
-if CONFIG['MOZ_CRASHREPORTER']:
-    DIRS += ['crashes']
-
 if CONFIG['BUILD_CTYPES']:
     DIRS += ['ctypes']