Bug 912121 - Adjust build configs and test manifests. r=glandium

This step resumes shipping client and server DevTools components to the correct
products, and is enough for "mach build" to complete successfully.

browser/app.mozbuild

@@ -17,4 +17,3 @@ if CONFIG['MOZ_WEBAPP_RUNTIME']:
 # Never add dirs after browser because they apparently won't get
 # packaged properly on Mac.
 DIRS += ['/browser']
-

browser/moz.build

@@ -17,10 +17,10 @@ DIRS += [
     'modules',
     'themes',
     'extensions',
+    '/devtools/client',
 ]
 
 DIRS += [
-    'devtools',
     'app',
 ]
 

devtools/client/framework/test/browser.ini

@@ -73,5 +73,4 @@ skip-if = os == "mac" && os_version == "10.8" || os == "win" && os_version == "5
 [browser_toolbox_selected_tool_unavailable.js]
 
 # We want this test to run for mochitest-dt as well, so we include it here:
-[../../../base/content/test/general/browser_parsable_css.js]
-
+[../../../../browser/base/content/test/general/browser_parsable_css.js]

devtools/server/moz.build

@@ -50,6 +50,7 @@ EXTRA_JS_MODULES.devtools.server.actors += [
     'actors/eventlooplag.js',
     'actors/framerate.js',
     'actors/gcli.js',
+    'actors/highlighters.css',
     'actors/highlighters.js',
     'actors/inspector.js',
     'actors/layout.js',

devtools/shared/heapsnapshot/tests/gtest/moz.build

@@ -7,7 +7,7 @@
 Library('devtoolstests')
 
 LOCAL_INCLUDES += [
-    '/toolkit/devtools/heapsnapshot',
+    '../..',
 ]
 
 UNIFIED_SOURCES = [

devtools/shared/moz.build

@@ -16,7 +16,6 @@ DIRS += [
     'pretty-fast',
     'qrcode',
     'security',
-    'server',
     'sourcemap',
     'shared',
     'styleinspector',
@@ -47,14 +46,6 @@ EXTRA_JS_MODULES.devtools += [
     'Loader.jsm',
 ]
 
-EXTRA_JS_MODULES.devtools.server.actors += [
-    'server/actors/highlighters.css'
-]
-
-EXTRA_JS_MODULES.devtools.layout += [
-    'layout/utils.js'
-]
-
 EXTRA_JS_MODULES.devtools.layout += [
     'layout/utils.js'
 ]

devtools/shared/shared/tests/browser/browser.ini

@@ -2,7 +2,7 @@
 tags = devtools
 subsuite = devtools
 support-files =
-  ../../../server/tests/browser/head.js
+  ../../../../server/tests/browser/head.js
 
 [browser_async_storage.js]
 [browser_worker-01.js]

toolkit/moz.build

@@ -7,7 +7,6 @@
 DIRS += [
     'components',
     'content',
-    'devtools',
     'forgetaboutsite',
     'identity',
     'locales',

toolkit/toolkit.mozbuild

@@ -143,6 +143,8 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
     DIRS += ['/extensions/pref']
 
 DIRS += [
+    '/devtools/server',
+    '/devtools/shared',
     '/services',
     '/startupcache',
     '/js/ductwork/debugger',