summaryrefslogtreecommitdiffstats
path: root/toolkit/toolkit.mozbuild
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-18 10:38:55 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-18 10:38:55 +0100
commit5839763c827cc35973e419026f926e9b8ffc118d (patch)
tree11fd29c791adc491430a7a9b516224c2a724868e /toolkit/toolkit.mozbuild
parent83c4b04a70d2319d4c292e7aa0c8872e7c1cd7fa (diff)
parent45f2fcd80d2a7d536e8b486c18415a337b56cb46 (diff)
downloadUXP-5839763c827cc35973e419026f926e9b8ffc118d.tar
UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.gz
UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.lz
UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.xz
UXP-5839763c827cc35973e419026f926e9b8ffc118d.zip
Merge branch 'master' into ported-moebius
# Conflicts: # browser/installer/windows/nsis/stub.nsi
Diffstat (limited to 'toolkit/toolkit.mozbuild')
-rw-r--r--toolkit/toolkit.mozbuild4
1 files changed, 3 insertions, 1 deletions
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 439282525..d94f1240a 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',