1 files changed, 8 insertions, 12 deletions
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 439282525..3b3bf80ae 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -132,8 +132,10 @@ DIRS += [
 if CONFIG['MOZ_PREF_EXTENSIONS']:
     DIRS += ['/extensions/pref']
 
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DIRS += ['/devtools']
+
 DIRS += [
-    '/devtools',
     '/services',
     '/startupcache',
     '/js/ductwork/debugger',
@@ -143,12 +145,6 @@ DIRS += [
 if CONFIG['MOZ_GIO_COMPONENT']:
     DIRS += ['/extensions/gio']
 
-if CONFIG['MOZ_RUST']:
-    DIRS += [
-        '/toolkit/library/gtest/rust',
-        '/toolkit/library/rust',
-    ]
-
 DIRS += [
     '/toolkit/library/StaticXULComponentsEnd',
     '/toolkit/library',
@@ -165,9 +161,13 @@ if CONFIG['ENABLE_MARIONETTE'] or CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('gonk', '
 
 DIRS += [
     '/tools/quitter',
-    '/media/gmp-clearkey/0.1',
 ]
 
+if CONFIG['MOZ_EME']:
+    DIRS += [
+    '/media/gmp-clearkey/0.1',
+    ]
+
 if CONFIG['ENABLE_TESTS']:
     DIRS += [
         '/testing/mochitest',
@@ -181,10 +181,6 @@ if CONFIG['ENABLE_TESTS']:
         '/testing/web-platform',
     ]
 
-    # The file id utility requires breakpad libraries.
-    if CONFIG['MOZ_CRASHREPORTER']:
-        DIRS += ['/testing/tools/fileid']
-
     if CONFIG['MOZ_MEMORY']:
         DIRS += ['/memory/gtest']