Bug 1217687 - Revert back to including /devtools via toolkit. r=glandium draft
authorJ. Ryan Stinnett <jryans@gmail.com>
Fri, 23 Oct 2015 02:43:09 -0500
changeset 302911 7060ded3194d6d0b17949edc3e76d93e013497aa
parent 302910 4c4a8135b8c65d69f0bf8e64e52832d287c1645b
child 510466 4ae76e370861c853dca3f7a19f9b6435aa6834ae
push id6701
push userjryans@gmail.com
push dateFri, 23 Oct 2015 07:45:52 +0000
reviewersglandium
bugs1217687
milestone44.0a1
Bug 1217687 - Revert back to including /devtools via toolkit. r=glandium
b2g/app.mozbuild
b2g/graphene/app.mozbuild
embedding/ios/app.mozbuild
mobile/android/app.mozbuild
mobile/android/b2gdroid/app.mozbuild
toolkit/toolkit.mozbuild
xulrunner/app.mozbuild
--- a/b2g/app.mozbuild
+++ b/b2g/app.mozbuild
@@ -7,10 +7,9 @@
 include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 DIRS += [
     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
     '/b2g',
-    '/devtools',
 ]
--- a/b2g/graphene/app.mozbuild
+++ b/b2g/graphene/app.mozbuild
@@ -6,13 +6,12 @@
 include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 DIRS += [
     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
     '/b2g',
-    '/devtools',
 ]
 
 # Add the defaults settings.
 FINAL_TARGET_FILES.defaults += [ 'b2g/graphene/settings.json' ]
--- a/embedding/ios/app.mozbuild
+++ b/embedding/ios/app.mozbuild
@@ -3,12 +3,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
-
-DIRS += [
-    '/devtools',
-]
--- a/mobile/android/app.mozbuild
+++ b/mobile/android/app.mozbuild
@@ -9,10 +9,9 @@ if CONFIG['ENABLE_TESTS']:
     DIRS += ['/testing/instrumentation']
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 DIRS += [
     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
     '/mobile/android',
-    '/devtools',
 ]
--- a/mobile/android/b2gdroid/app.mozbuild
+++ b/mobile/android/b2gdroid/app.mozbuild
@@ -9,10 +9,9 @@ if CONFIG['ENABLE_TESTS']:
     DIRS += ['/testing/instrumentation']
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 DIRS += [
     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
     '/mobile/android/b2gdroid',
-    '/devtools',
 ]
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -141,16 +141,23 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
 
 DIRS += [
     '/services',
     '/startupcache',
     '/js/ductwork/debugger',
     '/other-licenses/snappy',
 ]
 
+# /browser uses DIST_SUBDIR, so for that case we include /devtools elsewhere to
+# ensure it also has DIST_SUBDIR applied.
+if CONFIG['MOZ_BUILD_APP'] != 'browser':
+    DIRS += [
+        '/devtools',
+    ]
+
 if CONFIG['MOZ_GIO_COMPONENT']:
     DIRS += ['/extensions/gio']
 
 DIRS += [
     '/toolkit/library/StaticXULComponentsEnd',
     '/toolkit/library',
 ]
 
--- a/xulrunner/app.mozbuild
+++ b/xulrunner/app.mozbuild
@@ -5,10 +5,9 @@
 
 include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 DIRS += [
     '/xulrunner',
-    '/devtools',
 ]