1 files changed, 4 insertions, 9 deletions
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 6a745e51e..b5679ca50 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -85,12 +85,6 @@ DIRS += [
     '/xpfe/appshell'
 ]
 
-# This needs to be built after the gfx/ directory
-# to ensure all dependencies for skia (e.g. mozalloc, xpcom)
-# have been built
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    DIRS += ['/other-licenses/skia-npapi']
-
 if CONFIG['MOZ_UNIVERSALCHARDET']:
     DIRS += ['/extensions/universalchardet']
 
@@ -122,12 +116,13 @@ DIRS += [
 if CONFIG['MOZ_PREF_EXTENSIONS']:
     DIRS += ['/extensions/pref']
 
-DIRS += ['/devtools']
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DIRS += ['/devtools']
 
 DIRS += [
     '/services',
     '/startupcache',
-    '/js/ductwork/debugger',
+    '/js/ductwork',
     '/other-licenses/snappy',
 ]
 
@@ -142,7 +137,7 @@ DIRS += [
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     DIRS += ['/toolkit/system/gnome']
 
-if CONFIG['ENABLE_MARIONETTE'] or CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android'):
+if CONFIG['ENABLE_MARIONETTE'] or True:
     DIRS += [
         '/testing/firefox-ui',
         '/testing/marionette',